]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: gpio: Use traditional pattern when checking error codes
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 17 May 2024 19:42:02 +0000 (22:42 +0300)
committerMark Brown <broonie@kernel.org>
Mon, 27 May 2024 00:33:30 +0000 (01:33 +0100)
Instead of 'if (!ret)' switch to "check for the error first" rule.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://msgid.link/r/20240517194246.747427-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-gpio.c

index abf426711c2267bead5912972ec05f1a147a509f..36c587be9e2880ad60cf9ae3f42638f95e615851 100644 (file)
@@ -239,8 +239,8 @@ static void spi_gpio_chipselect(struct spi_device *spi, int is_active)
 static int spi_gpio_setup(struct spi_device *spi)
 {
        struct gpio_desc        *cs;
-       int                     status = 0;
        struct spi_gpio         *spi_gpio = spi_to_spi_gpio(spi);
+       int ret;
 
        /*
         * The CS GPIOs have already been
@@ -248,15 +248,14 @@ static int spi_gpio_setup(struct spi_device *spi)
         */
        if (spi_gpio->cs_gpios) {
                cs = spi_gpio->cs_gpios[spi_get_chipselect(spi, 0)];
-               if (!spi->controller_state && cs)
-                       status = gpiod_direction_output(cs,
-                                                 !(spi->mode & SPI_CS_HIGH));
+               if (!spi->controller_state && cs) {
+                       ret = gpiod_direction_output(cs, !(spi->mode & SPI_CS_HIGH));
+                       if (ret)
+                               return ret;
+               }
        }
 
-       if (!status)
-               status = spi_bitbang_setup(spi);
-
-       return status;
+       return spi_bitbang_setup(spi);
 }
 
 static int spi_gpio_set_direction(struct spi_device *spi, bool output)