]> git.baikalelectronics.ru Git - kernel.git/commitdiff
spi: rockchip-sfc: Fix assigned but never used return error codes
authorColin Ian King <colin.king@canonical.com>
Wed, 18 Aug 2021 14:10:51 +0000 (15:10 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 23 Aug 2021 15:41:08 +0000 (16:41 +0100)
Currently there are two places where the error return variable ret is
being assigned -ETIMEDOUT on timeout errors and this value is not
being returned. Fix this by returning -ETIMEDOUT rather than redundantly
assiging it to ret.

Addresses-Coverity: ("Unused value")
Fixes: adab32ee6d33 ("spi: rockchip-sfc: add rockchip serial flash controller")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Link: https://lore.kernel.org/r/20210818141051.36320-1-colin.king@canonical.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-rockchip-sfc.c

index 81154a8836fc8432e2a9ee3e479b36b011f6707b..a46b38544027321e5f9a8b70a3dd778ee3c5d245 100644 (file)
@@ -257,7 +257,7 @@ static int rockchip_sfc_wait_txfifo_ready(struct rockchip_sfc *sfc, u32 timeout_
        if (ret) {
                dev_dbg(sfc->dev, "sfc wait tx fifo timeout\n");
 
-               ret = -ETIMEDOUT;
+               return -ETIMEDOUT;
        }
 
        return (status & SFC_FSR_TXLV_MASK) >> SFC_FSR_TXLV_SHIFT;
@@ -274,7 +274,7 @@ static int rockchip_sfc_wait_rxfifo_ready(struct rockchip_sfc *sfc, u32 timeout_
        if (ret) {
                dev_dbg(sfc->dev, "sfc wait rx fifo timeout\n");
 
-               ret = -ETIMEDOUT;
+               return -ETIMEDOUT;
        }
 
        return (status & SFC_FSR_RXLV_MASK) >> SFC_FSR_RXLV_SHIFT;