tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

authored by

Eric Sesterhenn and committed by
Adrian Bunk 7e99e9b6 40094fa6

+5 -8
unified split
+5 -8
drivers/s390/net/lcs.c
··· 675 int index, rc; 676 677 LCS_DBF_TEXT(5, trace, "rdybuff"); 678 - if (buffer->state != BUF_STATE_LOCKED && 679 - buffer->state != BUF_STATE_PROCESSED) 680 - BUG(); 681 spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags); 682 buffer->state = BUF_STATE_READY; 683 index = buffer - channel->iob; ··· 700 int index, prev, next; 701 702 LCS_DBF_TEXT(5, trace, "prcsbuff"); 703 - if (buffer->state != BUF_STATE_READY) 704 - BUG(); 705 buffer->state = BUF_STATE_PROCESSED; 706 index = buffer - channel->iob; 707 prev = (index - 1) & (LCS_NUM_BUFFS - 1); ··· 732 unsigned long flags; 733 734 LCS_DBF_TEXT(5, trace, "relbuff"); 735 - if (buffer->state != BUF_STATE_LOCKED && 736 - buffer->state != BUF_STATE_PROCESSED) 737 - BUG(); 738 spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags); 739 buffer->state = BUF_STATE_EMPTY; 740 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
··· 675 int index, rc; 676 677 LCS_DBF_TEXT(5, trace, "rdybuff"); 678 + BUG_ON(buffer->state != BUF_STATE_LOCKED && 679 + buffer->state != BUF_STATE_PROCESSED); 680 spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags); 681 buffer->state = BUF_STATE_READY; 682 index = buffer - channel->iob; ··· 701 int index, prev, next; 702 703 LCS_DBF_TEXT(5, trace, "prcsbuff"); 704 + BUG_ON(buffer->state != BUF_STATE_READY); 705 buffer->state = BUF_STATE_PROCESSED; 706 index = buffer - channel->iob; 707 prev = (index - 1) & (LCS_NUM_BUFFS - 1); ··· 734 unsigned long flags; 735 736 LCS_DBF_TEXT(5, trace, "relbuff"); 737 + BUG_ON(buffer->state != BUF_STATE_LOCKED && 738 + buffer->state != BUF_STATE_PROCESSED); 739 spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags); 740 buffer->state = BUF_STATE_EMPTY; 741 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);