]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
dmaengine: Drop redundant 'else' keyword
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 26 Feb 2020 10:18:40 +0000 (12:18 +0200)
committerVinod Koul <vkoul@kernel.org>
Mon, 2 Mar 2020 07:18:13 +0000 (12:48 +0530)
It's obvious that 'else' keyword is redundant in the code like

if (foo)
return bar;
else if (baz)
...

Drop it for good.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200226101842.29426-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
include/linux/dmaengine.h

index ae56a91c2a0596effb894d9b8893a36fc9e74624..1bb5477ef7ec12d3fdcc71d547e716c6c171a330 100644 (file)
@@ -1230,9 +1230,9 @@ static inline int dma_maxpq(struct dma_device *dma, enum dma_ctrl_flags flags)
 {
        if (dma_dev_has_pq_continue(dma) || !dmaf_continue(flags))
                return dma_dev_to_maxpq(dma);
-       else if (dmaf_p_disabled_continue(flags))
+       if (dmaf_p_disabled_continue(flags))
                return dma_dev_to_maxpq(dma) - 1;
-       else if (dmaf_continue(flags))
+       if (dmaf_continue(flags))
                return dma_dev_to_maxpq(dma) - 3;
        BUG();
 }
@@ -1243,7 +1243,7 @@ static inline size_t dmaengine_get_icg(bool inc, bool sgl, size_t icg,
        if (inc) {
                if (dir_icg)
                        return dir_icg;
-               else if (sgl)
+               if (sgl)
                        return icg;
        }