OSDN Git Service

spi: a3700: make a3700_spi_init() return void
authorJason Yan <yanaijie@huawei.com>
Wed, 6 May 2020 06:19:11 +0000 (14:19 +0800)
committerMark Brown <broonie@kernel.org>
Wed, 6 May 2020 14:55:13 +0000 (15:55 +0100)
Fix the following coccicheck warning:

drivers/spi/spi-armada-3700.c:283:8-11: Unneeded variable: "ret". Return
"0" on line 315

Signed-off-by: Jason Yan <yanaijie@huawei.com>
Link: https://lore.kernel.org/r/20200506061911.19923-1-yanaijie@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-armada-3700.c

index e450ee1..fcde419 100644 (file)
@@ -276,11 +276,11 @@ static int a3700_spi_fifo_flush(struct a3700_spi *a3700_spi)
        return -ETIMEDOUT;
 }
 
-static int a3700_spi_init(struct a3700_spi *a3700_spi)
+static void a3700_spi_init(struct a3700_spi *a3700_spi)
 {
        struct spi_master *master = a3700_spi->master;
        u32 val;
-       int i, ret = 0;
+       int i;
 
        /* Reset SPI unit */
        val = spireg_read(a3700_spi, A3700_SPI_IF_CFG_REG);
@@ -311,8 +311,6 @@ static int a3700_spi_init(struct a3700_spi *a3700_spi)
        /* Mask the interrupts and clear cause bits */
        spireg_write(a3700_spi, A3700_SPI_INT_MASK_REG, 0);
        spireg_write(a3700_spi, A3700_SPI_INT_STAT_REG, ~0U);
-
-       return ret;
 }
 
 static irqreturn_t a3700_spi_interrupt(int irq, void *dev_id)
@@ -886,9 +884,7 @@ static int a3700_spi_probe(struct platform_device *pdev)
        master->min_speed_hz = DIV_ROUND_UP(clk_get_rate(spi->clk),
                                                A3700_SPI_MAX_PRESCALE);
 
-       ret = a3700_spi_init(spi);
-       if (ret)
-               goto error_clk;
+       a3700_spi_init(spi);
 
        ret = devm_request_irq(dev, spi->irq, a3700_spi_interrupt, 0,
                               dev_name(dev), master);