lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG_ON() Conversion in drivers/block/

Browse Source 
this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
This commit is contained in:
Eric Sesterhenn
2006-03-24 18:50:27 +01:00
committed by Adrian Bunk
parent 817dd6eed4
commit 089fe1b23d
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/block/DAC960.c
View File

@@ -228,8 +228,7 @@ static void *slice_dma_loaf(struct dma_loaf *loaf, size_t len,
void *cpu_end = loaf->cpu_free + len; void *cpu_end = loaf->cpu_free + len;
void *cpu_addr = loaf->cpu_free; void *cpu_addr = loaf->cpu_free;
if (cpu_end > loaf->cpu_base + loaf->length) BUG_ON(cpu_end > loaf->cpu_base + loaf->length);
BUG();
*dma_handle = loaf->dma_free; *dma_handle = loaf->dma_free;
loaf->cpu_free = cpu_end; loaf->cpu_free = cpu_end;
loaf->dma_free += len; loaf->dma_free += len;

3
drivers/block/cciss.c
View File

@@ -2361,8 +2361,7 @@ queue:
if (!creq) if (!creq)
goto startio; goto startio;
if (creq->nr_phys_segments > MAXSGENTRIES) BUG_ON(creq->nr_phys_segments > MAXSGENTRIES);
BUG();
if (( c = cmd_alloc(h, 1)) == NULL) if (( c = cmd_alloc(h, 1)) == NULL)
goto full; goto full;

2
drivers/block/cciss_scsi.c
View File

@@ -1316,7 +1316,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd
cp->Request.Timeout = 0; cp->Request.Timeout = 0;
memset(cp->Request.CDB, 0, sizeof(cp->Request.CDB)); memset(cp->Request.CDB, 0, sizeof(cp->Request.CDB));
if (cmd->cmd_len > sizeof(cp->Request.CDB)) BUG(); BUG_ON(cmd->cmd_len > sizeof(cp->Request.CDB));
cp->Request.CDBLen = cmd->cmd_len; cp->Request.CDBLen = cmd->cmd_len;
memcpy(cp->Request.CDB, cmd->cmnd, cmd->cmd_len); memcpy(cp->Request.CDB, cmd->cmnd, cmd->cmd_len);
cp->Request.Type.Type = TYPE_CMD; cp->Request.Type.Type = TYPE_CMD;

3
drivers/block/cpqarray.c
View File

@@ -906,8 +906,7 @@ queue_next:
if (!creq) if (!creq)
goto startio; goto startio;
if (creq->nr_phys_segments > SG_MAX) BUG_ON(creq->nr_phys_segments > SG_MAX);
BUG();
if ((c = cmd_alloc(h,1)) == NULL) if ((c = cmd_alloc(h,1)) == NULL)
goto startio; goto startio;