Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 089fe1b2 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk
Browse files

BUG_ON() Conversion in drivers/block/ 



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

Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent 817dd6ee

drivers/block/DAC960.c

+1 −2
Original line number Diff line number Diff line
@@ -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_addr = loaf->cpu_free;



	if (cpu_end > loaf->cpu_base + loaf->length)

		BUG();

	BUG_ON(cpu_end > loaf->cpu_base + loaf->length);

	*dma_handle = loaf->dma_free;

	loaf->cpu_free = cpu_end;

	loaf->dma_free += len;

drivers/block/cciss.c

+1 −2
Original line number Diff line number Diff line
@@ -2361,8 +2361,7 @@ queue: 
	if (!creq)

		goto startio;



	if (creq->nr_phys_segments > MAXSGENTRIES)

                BUG();

	BUG_ON(creq->nr_phys_segments > MAXSGENTRIES);



	if (( c = cmd_alloc(h, 1)) == NULL)

		goto full;

drivers/block/cciss_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd 


	cp->Request.Timeout = 0;

	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;

	memcpy(cp->Request.CDB, cmd->cmnd, cmd->cmd_len);

	cp->Request.Type.Type = TYPE_CMD;

drivers/block/cpqarray.c

+1 −2
Original line number Diff line number Diff line
@@ -906,8 +906,7 @@ queue_next: 
	if (!creq)

		goto startio;



	if (creq->nr_phys_segments > SG_MAX)

		BUG();

	BUG_ON(creq->nr_phys_segments > SG_MAX);



	if ((c = cmd_alloc(h,1)) == NULL)

		goto startio;