pinctrl: mcp23s08: Propagate error code from device_property_read_u32()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 7 Apr 2020 17:38:46 +0000 (20:38 +0300)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 16 Apr 2020 12:21:23 +0000 (14:21 +0200)
Return error code from device_property_read_u32() as is in mcp23s08_probe().
While here, drop status variable in mcp23s08_irq_set_type() which always 0.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200407173849.43628-6-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/pinctrl/pinctrl-mcp23s08.c

index 07b6924..515d1aa 100644 (file)
@@ -485,7 +485,6 @@ static int mcp23s08_irq_set_type(struct irq_data *data, unsigned int type)
        struct gpio_chip *gc = irq_data_get_irq_chip_data(data);
        struct mcp23s08 *mcp = gpiochip_get_data(gc);
        unsigned int pos = data->hwirq;
-       int status = 0;
 
        if ((type & IRQ_TYPE_EDGE_BOTH) == IRQ_TYPE_EDGE_BOTH) {
                mcp_set_bit(mcp, MCP_INTCON, pos, false);
@@ -508,7 +507,7 @@ static int mcp23s08_irq_set_type(struct irq_data *data, unsigned int type)
        } else
                return -EINVAL;
 
-       return status;
+       return 0;
 }
 
 static void mcp23s08_irq_bus_lock(struct irq_data *data)
@@ -964,7 +963,7 @@ static int mcp23s08_probe(struct spi_device *spi)
                                "mcp,spi-present-mask", &spi_present_mask);
                if (status) {
                        dev_err(&spi->dev, "missing spi-present-mask");
-                       return -ENODEV;
+                       return status;
                }
        }