From f396f06dcdacdae387ed9c7fccdc5c50d0c7754c Mon Sep 17 00:00:00 2001 From: Colin Ian King Date: Wed, 18 Aug 2021 15:10:51 +0100 Subject: [PATCH] UPSTREAM: spi: rockchip-sfc: Fix assigned but never used return error codes 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 assigning it to ret. (cherry picked from commit 745649c59a0d1fde9dcc02286f23f8c78a1f724d) Addresses-Coverity: ("Unused value") Fixes: 0b89fc0a367e ("spi: rockchip-sfc: add rockchip serial flash controller") Signed-off-by: Colin Ian King Signed-off-by: Jon Lin Change-Id: I0d92c38cbc2c0d9b663c6e5107ee8b4b73290c74 --- drivers/spi/spi-rockchip-sfc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-rockchip-sfc.c b/drivers/spi/spi-rockchip-sfc.c index 7c4d47fe80c2..827e205c5340 100644 --- a/drivers/spi/spi-rockchip-sfc.c +++ b/drivers/spi/spi-rockchip-sfc.c @@ -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;