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

Commit 7e99e9b6 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Adrian Bunk
Browse files

BUG_ON() Conversion in drivers/s390/net/lcs.c 



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 40094fa6

drivers/s390/net/lcs.c

+5 −8
Original line number Diff line number Diff line
@@ -675,9 +675,8 @@ lcs_ready_buffer(struct lcs_channel *channel, struct lcs_buffer *buffer) 
	int index, rc;



	LCS_DBF_TEXT(5, trace, "rdybuff");

	if (buffer->state != BUF_STATE_LOCKED &&

	    buffer->state != BUF_STATE_PROCESSED)

		BUG();

	BUG_ON(buffer->state != BUF_STATE_LOCKED &&

		buffer->state != BUF_STATE_PROCESSED);

	spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);

	buffer->state = BUF_STATE_READY;

	index = buffer - channel->iob;
@@ -701,8 +700,7 @@ __lcs_processed_buffer(struct lcs_channel *channel, struct lcs_buffer *buffer) 
	int index, prev, next;



	LCS_DBF_TEXT(5, trace, "prcsbuff");

	if (buffer->state != BUF_STATE_READY)

		BUG();

	BUG_ON(buffer->state != BUF_STATE_READY);

	buffer->state = BUF_STATE_PROCESSED;

	index = buffer - channel->iob;

	prev = (index - 1) & (LCS_NUM_BUFFS - 1);
@@ -734,9 +732,8 @@ lcs_release_buffer(struct lcs_channel *channel, struct lcs_buffer *buffer) 
	unsigned long flags;



	LCS_DBF_TEXT(5, trace, "relbuff");

	if (buffer->state != BUF_STATE_LOCKED &&

	    buffer->state != BUF_STATE_PROCESSED)

		BUG();

	BUG_ON(buffer->state != BUF_STATE_LOCKED &&

		buffer->state != BUF_STATE_PROCESSED);

	spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);

	buffer->state = BUF_STATE_EMPTY;

	spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);