Merge tag 'at91-drivers-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / gpio / gpio-mcp23s08.c

diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index 57adbc90fdad8f4dc821fea920f599031e602dad..6f183d9b487eaee65f01906573af1ca48d3341ec 100644 (file)
--- a/drivers/gpio/gpio-mcp23s08.c
+++ b/drivers/gpio/gpio-mcp23s08.c
@@ -812,16 +812,14 @@ fail:
 static int mcp230xx_remove(struct i2c_client *client)
 {
        struct mcp23s08 *mcp = i2c_get_clientdata(client);
-       int status;
 
        if (client->irq && mcp->irq_controller)
                mcp23s08_irq_teardown(mcp);
 
-       status = gpiochip_remove(&mcp->chip);
-       if (status == 0)
-               kfree(mcp);
+       gpiochip_remove(&mcp->chip);
+       kfree(mcp);
 
-       return status;
+       return 0;
 }
 
 static const struct i2c_device_id mcp230xx_id[] = {
@@ -960,13 +958,10 @@ static int mcp23s08_probe(struct spi_device *spi)
 
 fail:
        for (addr = 0; addr < ARRAY_SIZE(data->mcp); addr++) {
-               int tmp;
 
                if (!data->mcp[addr])
                        continue;
-               tmp = gpiochip_remove(&data->mcp[addr]->chip);
-               if (tmp < 0)
-                       dev_err(&spi->dev, "%s --> %d\n", "remove", tmp);
+               gpiochip_remove(&data->mcp[addr]->chip);
        }
        kfree(data);
        return status;
@@ -976,23 +971,16 @@ static int mcp23s08_remove(struct spi_device *spi)
 {
        struct mcp23s08_driver_data     *data = spi_get_drvdata(spi);
        unsigned                        addr;
-       int                             status = 0;
 
        for (addr = 0; addr < ARRAY_SIZE(data->mcp); addr++) {
-               int tmp;
 
                if (!data->mcp[addr])
                        continue;
 
-               tmp = gpiochip_remove(&data->mcp[addr]->chip);
-               if (tmp < 0) {
-                       dev_err(&spi->dev, "%s --> %d\n", "remove", tmp);
-                       status = tmp;
-               }
+               gpiochip_remove(&data->mcp[addr]->chip);
        }
-       if (status == 0)
-               kfree(data);
-       return status;
+       kfree(data);
+       return 0;
 }
 
 static const struct spi_device_id mcp23s08_ids[] = {