Merge tag 'iommu-fixes-v4.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / lib / kfifo.c

diff --git a/lib/kfifo.c b/lib/kfifo.c
index d79b9d222065bd9467e4e091ad850a2ce4d93c94..90ba1eb1df06e5283a2dad9132b53346f5106812 100644 (file)
--- a/lib/kfifo.c
+++ b/lib/kfifo.c
@@ -561,8 +561,7 @@ EXPORT_SYMBOL(__kfifo_to_user_r);
 unsigned int __kfifo_dma_in_prepare_r(struct __kfifo *fifo,
        struct scatterlist *sgl, int nents, unsigned int len, size_t recsize)
 {
-       if (!nents)
-               BUG();
+       BUG_ON(!nents);
 
        len = __kfifo_max_r(len, recsize);
 
@@ -585,8 +584,7 @@ EXPORT_SYMBOL(__kfifo_dma_in_finish_r);
 unsigned int __kfifo_dma_out_prepare_r(struct __kfifo *fifo,
        struct scatterlist *sgl, int nents, unsigned int len, size_t recsize)
 {
-       if (!nents)
-               BUG();
+       BUG_ON(!nents);
 
        len = __kfifo_max_r(len, recsize);