gpio: remove all usage of gpio_remove retval in driver/gpio

Signed-off-by: abdoulaye berthe <berthe.ab@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-74x164.c b/drivers/gpio/gpio-74x164.c
index e4ae29824c328d7f717f6a908d9b2e21e7c2074f..e3d968f751f124e2eda733e2ee2a061fd08b1cbd 100644 (file)
--- a/drivers/gpio/gpio-74x164.c
+++ b/drivers/gpio/gpio-74x164.c
@@ -167,13 +167,11 @@ exit_destroy:
 static int gen_74x164_remove(struct spi_device *spi)
 {
        struct gen_74x164_chip *chip = spi_get_drvdata(spi);
-       int ret;
 
-       ret = gpiochip_remove(&chip->gpio_chip);
-       if (!ret)
-               mutex_destroy(&chip->lock);
+       gpiochip_remove(&chip->gpio_chip);
+       mutex_destroy(&chip->lock);
 
-       return ret;
+       return 0;
 }
 
 static const struct of_device_id gen_74x164_dt_ids[] = {

diff --git a/drivers/gpio/gpio-adnp.c b/drivers/gpio/gpio-adnp.c
index b2239d678d0173ac87c42dc312d734e822f4e981..416b2200d4f1b8f7aa385153c9ba50c6f870a54d 100644 (file)
--- a/drivers/gpio/gpio-adnp.c
+++ b/drivers/gpio/gpio-adnp.c
@@ -585,15 +585,8 @@ static int adnp_i2c_remove(struct i2c_client *client)
 {
        struct adnp *adnp = i2c_get_clientdata(client);
        struct device_node *np = client->dev.of_node;
-       int err;
-
-       err = gpiochip_remove(&adnp->gpio);
-       if (err < 0) {
-               dev_err(&client->dev, "%s failed: %d\n", "gpiochip_remove()",
-                       err);
-               return err;
-       }
 
+       gpiochip_remove(&adnp->gpio);
        if (of_find_property(np, "interrupt-controller", NULL))
                adnp_irq_teardown(adnp);
 

diff --git a/drivers/gpio/gpio-adp5520.c b/drivers/gpio/gpio-adp5520.c
index f1ade8fa3218c346ddbe1867ba2242b146a94ec8..b08bd169e568addff53b71c514658945a1001caf 100644 (file)
--- a/drivers/gpio/gpio-adp5520.c
+++ b/drivers/gpio/gpio-adp5520.c
@@ -167,15 +167,9 @@ err:
 static int adp5520_gpio_remove(struct platform_device *pdev)
 {
        struct adp5520_gpio *dev;
-       int ret;
 
        dev = platform_get_drvdata(pdev);
-       ret = gpiochip_remove(&dev->gpio_chip);
-       if (ret) {
-               dev_err(&pdev->dev, "%s failed, %d\n",
-                               "gpiochip_remove()", ret);
-               return ret;
-       }
+       gpiochip_remove(&dev->gpio_chip);
 
        return 0;
 }

diff --git a/drivers/gpio/gpio-adp5588.c b/drivers/gpio/gpio-adp5588.c
index ef19bc33f2bd3845cdc46b396e2f2949b36e15df..3beed6ea8c6568fbd4d560e5dd2da8f6102ba167 100644 (file)
--- a/drivers/gpio/gpio-adp5588.c
+++ b/drivers/gpio/gpio-adp5588.c
@@ -470,11 +470,7 @@ static int adp5588_gpio_remove(struct i2c_client *client)
        if (dev->irq_base)
                free_irq(dev->client->irq, dev);
 
-       ret = gpiochip_remove(&dev->gpio_chip);
-       if (ret) {
-               dev_err(&client->dev, "gpiochip_remove failed %d\n", ret);
-               return ret;
-       }
+       gpiochip_remove(&dev->gpio_chip);
 
        kfree(dev);
        return 0;

diff --git a/drivers/gpio/gpio-amd8111.c b/drivers/gpio/gpio-amd8111.c
index 94e9992f890494a8342a618747cbe540bc448233..3c09f1a6872aa22dd0e4784082f838c58cd8ee8b 100644 (file)
--- a/drivers/gpio/gpio-amd8111.c
+++ b/drivers/gpio/gpio-amd8111.c
@@ -232,8 +232,7 @@ out:
 
 static void __exit amd_gpio_exit(void)
 {
-       int err = gpiochip_remove(&gp.chip);
-       WARN_ON(err);
+       gpiochip_remove(&gp.chip);
        ioport_unmap(gp.pm);
        release_region(gp.pmbase + PMBASE_OFFSET, PMBASE_SIZE);
 }

diff --git a/drivers/gpio/gpio-arizona.c b/drivers/gpio/gpio-arizona.c
index 29bdff558981306c4f9c78419a5bafa723536900..fe369f5c7fa6d96c578ff202fcc6bab58bf0a5b2 100644 (file)
--- a/drivers/gpio/gpio-arizona.c
+++ b/drivers/gpio/gpio-arizona.c
@@ -149,7 +149,8 @@ static int arizona_gpio_remove(struct platform_device *pdev)
 {
        struct arizona_gpio *arizona_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&arizona_gpio->gpio_chip);
+       gpiochip_remove(&arizona_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver arizona_gpio_driver = {

diff --git a/drivers/gpio/gpio-cs5535.c b/drivers/gpio/gpio-cs5535.c
index c0a3aeba6f21b3375d59833abc918c8d7a2709b5..92ec58fa92369c8a7717719219a9b7bdfa600826 100644 (file)
--- a/drivers/gpio/gpio-cs5535.c
+++ b/drivers/gpio/gpio-cs5535.c
@@ -358,14 +358,8 @@ done:
 static int cs5535_gpio_remove(struct platform_device *pdev)
 {
        struct resource *r;
-       int err;
 
-       err = gpiochip_remove(&cs5535_gpio_chip.chip);
-       if (err) {
-               /* uhh? */
-               dev_err(&pdev->dev, "unable to remove gpio_chip?\n");
-               return err;
-       }
+       gpiochip_remove(&cs5535_gpio_chip.chip);
 
        r = platform_get_resource(pdev, IORESOURCE_IO, 0);
        release_region(r->start, resource_size(r));

diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index 416cdf786b05fe4c73ff8f83e83f01676c2e1450..c5bccd4dec9641257a1fc010191d19939ef33333 100644 (file)
--- a/drivers/gpio/gpio-da9052.c
+++ b/drivers/gpio/gpio-da9052.c
@@ -237,7 +237,8 @@ static int da9052_gpio_remove(struct platform_device *pdev)
 {
        struct da9052_gpio *gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&gpio->gp);
+       gpiochip_remove(&gpio->gp);
+       return 0;
 }
 
 static struct platform_driver da9052_gpio_driver = {

diff --git a/drivers/gpio/gpio-da9055.c b/drivers/gpio/gpio-da9055.c
index f992997bc30125c64b0731367c56fd4742efe17c..9167c433108149b3090d326842efc55e36a573b6 100644 (file)
--- a/drivers/gpio/gpio-da9055.c
+++ b/drivers/gpio/gpio-da9055.c
@@ -174,7 +174,8 @@ static int da9055_gpio_remove(struct platform_device *pdev)
 {
        struct da9055_gpio *gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&gpio->gp);
+       gpiochip_remove(&gpio->gp);
+       return 0;
 }
 
 static struct platform_driver da9055_gpio_driver = {

diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index cd3b814352748c3dd9786e0b2343f352d2188cd4..d6618a6e2399ff22ffb4772aa4badcb5075ba63b 100644 (file)
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -359,7 +359,7 @@ static void dwapb_gpio_unregister(struct dwapb_gpio *gpio)
 
        for (m = 0; m < gpio->nr_ports; ++m)
                if (gpio->ports[m].is_registered)
-                       WARN_ON(gpiochip_remove(&gpio->ports[m].bgc.gc));
+                       gpiochip_remove(&gpio->ports[m].bgc.gc);
 }
 
 static int dwapb_gpio_probe(struct platform_device *pdev)

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index cde36054c3875dfed67706ee6e1bbbcb0b0179b9..fe49ec3cdb7d971329f88721daf606569696a180 100644 (file)
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -409,11 +409,8 @@ err0:
 static int em_gio_remove(struct platform_device *pdev)
 {
        struct em_gio_priv *p = platform_get_drvdata(pdev);
-       int ret;
 
-       ret = gpiochip_remove(&p->gpio_chip);
-       if (ret)
-               return ret;
+       gpiochip_remove(&p->gpio_chip);
 
        irq_domain_remove(p->irq_domain);
        return 0;

diff --git a/drivers/gpio/gpio-f7188x.c b/drivers/gpio/gpio-f7188x.c
index 8f73ee093739fd851a299178282d0a34ab06edfc..fd3202f968ff51c4640d36b37dbb934c88b9e932 100644 (file)
--- a/drivers/gpio/gpio-f7188x.c
+++ b/drivers/gpio/gpio-f7188x.c
@@ -317,13 +317,7 @@ static int f7188x_gpio_probe(struct platform_device *pdev)
 err_gpiochip:
        for (i = i - 1; i >= 0; i--) {
                struct f7188x_gpio_bank *bank = &data->bank[i];
-               int tmp;
-
-               tmp = gpiochip_remove(&bank->chip);
-               if (tmp < 0)
-                       dev_err(&pdev->dev,
-                               "Failed to remove gpiochip %d: %d\n",
-                               i, tmp);
+               gpiochip_remove(&bank->chip);
        }
 
        return err;
@@ -331,20 +325,12 @@ err_gpiochip:
 
 static int f7188x_gpio_remove(struct platform_device *pdev)
 {
-       int err;
        int i;
        struct f7188x_gpio_data *data = platform_get_drvdata(pdev);
 
        for (i = 0; i < data->nr_bank; i++) {
                struct f7188x_gpio_bank *bank = &data->bank[i];
-
-               err = gpiochip_remove(&bank->chip);
-               if (err) {
-                       dev_err(&pdev->dev,
-                               "Failed to remove GPIO gpiochip %d: %d\n",
-                               i, err);
-                       return err;
-               }
+               gpiochip_remove(&bank->chip);
        }
 
        return 0;

diff --git a/drivers/gpio/gpio-generic.c b/drivers/gpio/gpio-generic.c
index fea8c82bb8fcc2a96bfb4135dbeed0845b46d517..16f6115e5bdb5fd8ae2ff32b706f008e2a041d8a 100644 (file)
--- a/drivers/gpio/gpio-generic.c
+++ b/drivers/gpio/gpio-generic.c
@@ -398,7 +398,8 @@ static int bgpio_request(struct gpio_chip *chip, unsigned gpio_pin)
 
 int bgpio_remove(struct bgpio_chip *bgc)
 {
-       return gpiochip_remove(&bgc->gc);
+       gpiochip_remove(&bgc->gc);
+       return 0;
 }
 EXPORT_SYMBOL_GPL(bgpio_remove);
 

diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c
index 3c3f515b7916b1a32b2c25a1845989df978a7f03..66ad3df9d9cfdbbb3acab6af63df4a6101d8671a 100644 (file)
--- a/drivers/gpio/gpio-grgpio.c
+++ b/drivers/gpio/gpio-grgpio.c
@@ -468,9 +468,7 @@ static int grgpio_remove(struct platform_device *ofdev)
                }
        }
 
-       ret = gpiochip_remove(&priv->bgc.gc);
-       if (ret)
-               goto out;
+       gpiochip_remove(&priv->bgc.gc);
 
        if (priv->domain)
                irq_domain_remove(priv->domain);

diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
index 70304220a479a9862f4f5709e6a9a88a785b487d..3784e81e7762aa0f8d25dff0bc11030e80d9c59d 100644 (file)
--- a/drivers/gpio/gpio-ich.c
+++ b/drivers/gpio/gpio-ich.c
@@ -514,14 +514,7 @@ add_err:
 
 static int ichx_gpio_remove(struct platform_device *pdev)
 {
-       int err;
-
-       err = gpiochip_remove(&ichx_priv.chip);
-       if (err) {
-               dev_err(&pdev->dev, "%s failed, %d\n",
-                               "gpiochip_remove()", err);
-               return err;
-       }
+       gpiochip_remove(&ichx_priv.chip);
 
        ichx_gpio_release_regions(ichx_priv.gpio_base, ichx_priv.use_gpio);
        if (ichx_priv.pm_base)

diff --git a/drivers/gpio/gpio-it8761e.c b/drivers/gpio/gpio-it8761e.c
index 278b81317010f3a2fbff9637f42029a0d79c360b..dadfc245cf0993ac27615fee19ca66262f683458 100644 (file)
--- a/drivers/gpio/gpio-it8761e.c
+++ b/drivers/gpio/gpio-it8761e.c
@@ -217,11 +217,7 @@ gpiochip_add_err:
 static void __exit it8761e_gpio_exit(void)
 {
        if (gpio_ba) {
-               int ret = gpiochip_remove(&it8761e_gpio_chip);
-
-               WARN(ret, "%s(): gpiochip_remove() failed, ret=%d\n",
-                               __func__, ret);
-
+               gpiochip_remove(&it8761e_gpio_chip);
                release_region(gpio_ba, GPIO_IOSIZE);
                gpio_ba = 0;
        }

diff --git a/drivers/gpio/gpio-janz-ttl.c b/drivers/gpio/gpio-janz-ttl.c
index 42852eaaf0200a43320ac946db793939e162ff50..29ffe22ad97ac641285dd58c47004e4ffe5bdaa2 100644 (file)
--- a/drivers/gpio/gpio-janz-ttl.c
+++ b/drivers/gpio/gpio-janz-ttl.c
@@ -194,14 +194,8 @@ static int ttl_probe(struct platform_device *pdev)
 static int ttl_remove(struct platform_device *pdev)
 {
        struct ttl_module *mod = platform_get_drvdata(pdev);
-       struct device *dev = &pdev->dev;
-       int ret;
 
-       ret = gpiochip_remove(&mod->gpio);
-       if (ret) {
-               dev_err(dev, "unable to remove GPIO chip\n");
-               return ret;
-       }
+       gpiochip_remove(&mod->gpio);
 
        return 0;
 }

diff --git a/drivers/gpio/gpio-kempld.c b/drivers/gpio/gpio-kempld.c
index 1e5e51987d315fdce98f67d3c9f8db776fa83de6..fd150adeebf925f19f13f7a475b96c6074670675 100644 (file)
--- a/drivers/gpio/gpio-kempld.c
+++ b/drivers/gpio/gpio-kempld.c
@@ -199,7 +199,8 @@ static int kempld_gpio_remove(struct platform_device *pdev)
 {
        struct kempld_gpio_data *gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&gpio->chip);
+       gpiochip_remove(&gpio->chip);
+       return 0;
 }
 
 static struct platform_driver kempld_gpio_driver = {

diff --git a/drivers/gpio/gpio-lp3943.c b/drivers/gpio/gpio-lp3943.c
index a0341c92bcb40cbe84bd6c132312b707744ba2d8..6bbdad805b78f08c4d089041d24735ce5c94451a 100644 (file)
--- a/drivers/gpio/gpio-lp3943.c
+++ b/drivers/gpio/gpio-lp3943.c
@@ -216,7 +216,8 @@ static int lp3943_gpio_remove(struct platform_device *pdev)
 {
        struct lp3943_gpio *lp3943_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&lp3943_gpio->chip);
+       gpiochip_remove(&lp3943_gpio->chip);
+       return 0;
 }
 
 static const struct of_device_id lp3943_gpio_of_match[] = {

diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c
index 2bea89b72508b8a54f7857c6ec3ca46e91c1c45e..7c141dd850a13fd354fa579e8e70b47320c108ea 100644 (file)
--- a/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@ -465,11 +465,8 @@ MODULE_DEVICE_TABLE(acpi, lynxpoint_gpio_acpi_match);
 static int lp_gpio_remove(struct platform_device *pdev)
 {
        struct lp_gpio *lg = platform_get_drvdata(pdev);
-       int err;
        pm_runtime_disable(&pdev->dev);
-       err = gpiochip_remove(&lg->chip);
-       if (err)
-               dev_warn(&pdev->dev, "failed to remove gpio_chip.\n");
+       gpiochip_remove(&lg->chip);
        return 0;
 }
 

diff --git a/drivers/gpio/gpio-max730x.c b/drivers/gpio/gpio-max730x.c
index 0814584fcdc1e1164850231cf0e951510bee57e6..18ab89e208065911cd9fe4261686579360331095 100644 (file)
--- a/drivers/gpio/gpio-max730x.c
+++ b/drivers/gpio/gpio-max730x.c
@@ -228,21 +228,16 @@ EXPORT_SYMBOL_GPL(__max730x_probe);
 int __max730x_remove(struct device *dev)
 {
        struct max7301 *ts = dev_get_drvdata(dev);
-       int ret;
 
        if (ts == NULL)
                return -ENODEV;
 
        /* Power down the chip and disable IRQ output */
        ts->write(dev, 0x04, 0x00);
-
-       ret = gpiochip_remove(&ts->chip);
-       if (!ret)
-               mutex_destroy(&ts->lock);
-       else
-               dev_err(dev, "Failed to remove GPIO controller: %d\n", ret);
-
-       return ret;
+       gpiochip_remove(&ts->chip);
+       mutex_destroy(&ts->lock);
+       kfree(ts);
+       return 0;
 }
 EXPORT_SYMBOL_GPL(__max730x_remove);
 

diff --git a/drivers/gpio/gpio-max732x.c b/drivers/gpio/gpio-max732x.c
index 7c36f2b0983d89b355c047d087781df24db4ce03..6c676225b886c995b603a9dd4bfb217b32b0e871 100644 (file)
--- a/drivers/gpio/gpio-max732x.c
+++ b/drivers/gpio/gpio-max732x.c
@@ -676,12 +676,7 @@ static int max732x_remove(struct i2c_client *client)
                }
        }
 
-       ret = gpiochip_remove(&chip->gpio_chip);
-       if (ret) {
-               dev_err(&client->dev, "%s failed, %d\n",
-                               "gpiochip_remove()", ret);
-               return ret;
-       }
+       gpiochip_remove(&chip->gpio_chip);
 
        max732x_irq_teardown(chip);
 

diff --git a/drivers/gpio/gpio-mc33880.c b/drivers/gpio/gpio-mc33880.c
index 553a80a5eaf3786bcf3e8436d6b4cb16d579c1cc..4e3e160e5db2cbd72ca9755ab9eedff2fc04c99c 100644 (file)
--- a/drivers/gpio/gpio-mc33880.c
+++ b/drivers/gpio/gpio-mc33880.c
@@ -149,20 +149,15 @@ exit_destroy:
 static int mc33880_remove(struct spi_device *spi)
 {
        struct mc33880 *mc;
-       int ret;
 
        mc = spi_get_drvdata(spi);
        if (mc == NULL)
                return -ENODEV;
 
-       ret = gpiochip_remove(&mc->chip);
-       if (!ret)
-               mutex_destroy(&mc->lock);
-       else
-               dev_err(&spi->dev, "Failed to remove the GPIO controller: %d\n",
-                       ret);
+       gpiochip_remove(&mc->chip);
+       mutex_destroy(&mc->lock);
 
-       return ret;
+       return 0;
 }
 
 static struct spi_driver mc33880_driver = {

diff --git a/drivers/gpio/gpio-mc9s08dz60.c b/drivers/gpio/gpio-mc9s08dz60.c
index dce35ff00db72ff6224dfc519a5928b9bd21a337..d62b4f8182bf0c9ca7259299fd1451e85b358e81 100644 (file)
--- a/drivers/gpio/gpio-mc9s08dz60.c
+++ b/drivers/gpio/gpio-mc9s08dz60.c
@@ -118,7 +118,8 @@ static int mc9s08dz60_remove(struct i2c_client *client)
 
        mc9s = i2c_get_clientdata(client);
 
-       return gpiochip_remove(&mc9s->chip);
+       gpiochip_remove(&mc9s->chip);
+       return 0;
 }
 
 static const struct i2c_device_id mc9s08dz60_id[] = {

diff --git a/drivers/gpio/gpio-mcp23s08.c b/drivers/gpio/gpio-mcp23s08.c
index fe7c0e211f9a85becb51bf64a808033c50203cee..4fe07864fa039736c3a2febde64a01a3ac41829e 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[] = {
@@ -966,13 +964,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;
@@ -982,23 +977,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[] = {

diff --git a/drivers/gpio/gpio-ml-ioh.c b/drivers/gpio/gpio-ml-ioh.c
index d51329d23d38c4d1188f4d9844ddc2308618ae4a..5536108aa9db5c8e6a7aa5e0fbbecdfe4ae03c95 100644 (file)
--- a/drivers/gpio/gpio-ml-ioh.c
+++ b/drivers/gpio/gpio-ml-ioh.c
@@ -497,8 +497,7 @@ err_irq_alloc_descs:
 err_gpiochip_add:
        while (--i >= 0) {
                chip--;
-               if (gpiochip_remove(&chip->gpio))
-                       dev_err(&pdev->dev, "Failed gpiochip_remove(%d)\n", i);
+               gpiochip_remove(&chip->gpio);
        }
        kfree(chip_save);
 
@@ -519,7 +518,6 @@ err_pci_enable:
 
 static void ioh_gpio_remove(struct pci_dev *pdev)
 {
-       int err;
        int i;
        struct ioh_gpio *chip = pci_get_drvdata(pdev);
        void *chip_save;
@@ -530,9 +528,7 @@ static void ioh_gpio_remove(struct pci_dev *pdev)
 
        for (i = 0; i < 8; i++, chip++) {
                irq_free_descs(chip->irq_base, num_ports[i]);
-               err = gpiochip_remove(&chip->gpio);
-               if (err)
-                       dev_err(&pdev->dev, "Failed gpiochip_remove\n");
+               gpiochip_remove(&chip->gpio);
        }
 
        chip = chip_save;

diff --git a/drivers/gpio/gpio-msm-v2.c b/drivers/gpio/gpio-msm-v2.c
index a3351acd4963f2ab754b4760da30fe72b3a95903..94f57670df9a9e69fb7ed846ce4c1f1f601a53c1 100644 (file)
--- a/drivers/gpio/gpio-msm-v2.c
+++ b/drivers/gpio/gpio-msm-v2.c
@@ -438,10 +438,7 @@ MODULE_DEVICE_TABLE(of, msm_gpio_of_match);
 
 static int msm_gpio_remove(struct platform_device *dev)
 {
-       int ret = gpiochip_remove(&msm_gpio.gpio_chip);
-
-       if (ret < 0)
-               return ret;
+       gpiochip_remove(&msm_gpio.gpio_chip);
 
        irq_set_handler(msm_gpio.summary_irq, NULL);
 

diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
index db83b3c0a44959f47851d3705fe7bb5b337a8577..f4e54a92e04a4b2b041be4ed41e684e4008b31be 100644 (file)
--- a/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@ -485,7 +485,7 @@ static int mxc_gpio_probe(struct platform_device *pdev)
 out_irqdesc_free:
        irq_free_descs(irq_base, 32);
 out_gpiochip_remove:
-       WARN_ON(gpiochip_remove(&port->bgc.gc) < 0);
+       gpiochip_remove(&port->bgc.gc);
 out_bgpio_remove:
        bgpio_remove(&port->bgc);
 out_bgio:

diff --git a/drivers/gpio/gpio-octeon.c b/drivers/gpio/gpio-octeon.c
index dbb08546b9ec2e70eb73cd4cf87e76fba39af368..5c5770c99c806e07b8b42266c3a9c779a58b98d0 100644 (file)
--- a/drivers/gpio/gpio-octeon.c
+++ b/drivers/gpio/gpio-octeon.c
@@ -129,7 +129,8 @@ out:
 static int octeon_gpio_remove(struct platform_device *pdev)
 {
        struct gpio_chip *chip = pdev->dev.platform_data;
-       return gpiochip_remove(chip);
+       gpiochip_remove(chip);
+       return 0;
 }
 
 static struct of_device_id octeon_gpio_match[] = {

diff --git a/drivers/gpio/gpio-palmas.c b/drivers/gpio/gpio-palmas.c
index 86bdbe362068db02b61b2a2bbbdfd3f1cdf0aa2b..171a6389f9ce086ffdf74f6c50523a77e205b473 100644 (file)
--- a/drivers/gpio/gpio-palmas.c
+++ b/drivers/gpio/gpio-palmas.c
@@ -210,7 +210,8 @@ static int palmas_gpio_remove(struct platform_device *pdev)
 {
        struct palmas_gpio *palmas_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&palmas_gpio->gpio_chip);
+       gpiochip_remove(&palmas_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver palmas_gpio_driver = {

diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c
index e721a37c3473efb5168dcb8c664fe1abe0c2a6d7..f9961eea2120a051b0ada70a3f6483baaa6a826c 100644 (file)
--- a/drivers/gpio/gpio-pca953x.c
+++ b/drivers/gpio/gpio-pca953x.c
@@ -765,12 +765,7 @@ static int pca953x_remove(struct i2c_client *client)
                }
        }
 
-       ret = gpiochip_remove(&chip->gpio_chip);
-       if (ret) {
-               dev_err(&client->dev, "%s failed, %d\n",
-                               "gpiochip_remove()", ret);
-               return ret;
-       }
+       gpiochip_remove(&chip->gpio_chip);
 
        return 0;
 }

diff --git a/drivers/gpio/gpio-pcf857x.c b/drivers/gpio/gpio-pcf857x.c
index 27b46751ea7e86756f80e1c28664fe5736ca351b..236708ad0a5ba0ab9c0ee95a8d2db648e930cb29 100644 (file)
--- a/drivers/gpio/gpio-pcf857x.c
+++ b/drivers/gpio/gpio-pcf857x.c
@@ -444,9 +444,7 @@ static int pcf857x_remove(struct i2c_client *client)
        if (client->irq)
                pcf857x_irq_domain_cleanup(gpio);
 
-       status = gpiochip_remove(&gpio->chip);
-       if (status)
-               dev_err(&client->dev, "%s --> %d\n", "remove", status);
+       gpiochip_remove(&gpio->chip);
        return status;
 }
 

diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index d6eac9b17db9ef33803a68f98097347d5543097b..e0ac549dccb54c43261d71df59da196144502d67 100644 (file)
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -426,9 +426,7 @@ end:
 
 err_request_irq:
        irq_free_descs(irq_base, gpio_pins[chip->ioh]);
-
-       if (gpiochip_remove(&chip->gpio))
-               dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__);
+       gpiochip_remove(&chip->gpio);
 
 err_gpiochip_add:
        pci_iounmap(pdev, chip->base);
@@ -447,7 +445,6 @@ err_pci_enable:
 
 static void pch_gpio_remove(struct pci_dev *pdev)
 {
-       int err;
        struct pch_gpio *chip = pci_get_drvdata(pdev);
 
        if (chip->irq_base != -1) {
@@ -456,10 +453,7 @@ static void pch_gpio_remove(struct pci_dev *pdev)
                irq_free_descs(chip->irq_base, gpio_pins[chip->ioh]);
        }
 
-       err = gpiochip_remove(&chip->gpio);
-       if (err)
-               dev_err(&pdev->dev, "Failed gpiochip_remove\n");
-
+       gpiochip_remove(&chip->gpio);
        pci_iounmap(pdev, chip->base);
        pci_release_regions(pdev);
        pci_disable_device(pdev);

diff --git a/drivers/gpio/gpio-rc5t583.c b/drivers/gpio/gpio-rc5t583.c
index 562b0c4d9cc888a01af998e48c337ace1a23ce4e..769233d2da6d610123cc424453bcd011c97c8606 100644 (file)
--- a/drivers/gpio/gpio-rc5t583.c
+++ b/drivers/gpio/gpio-rc5t583.c
@@ -148,7 +148,8 @@ static int rc5t583_gpio_remove(struct platform_device *pdev)
 {
        struct rc5t583_gpio *rc5t583_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&rc5t583_gpio->gpio_chip);
+       gpiochip_remove(&rc5t583_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver rc5t583_gpio_driver = {

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index 7c621211e17b03a35f091f528544430386727d0c..c96e2afdad78820542e6588d5b0f8feef36f1b64 100644 (file)
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -471,11 +471,8 @@ err0:
 static int gpio_rcar_remove(struct platform_device *pdev)
 {
        struct gpio_rcar_priv *p = platform_get_drvdata(pdev);
-       int ret;
 
-       ret = gpiochip_remove(&p->gpio_chip);
-       if (ret)
-               return ret;
+       gpiochip_remove(&p->gpio_chip);
 
        irq_domain_remove(p->irq_domain);
        pm_runtime_put(&pdev->dev);

diff --git a/drivers/gpio/gpio-rdc321x.c b/drivers/gpio/gpio-rdc321x.c
index 9fa7e53331c92b8a04eb175b647ed9b2a69e1eda..d729bc8a554d90faf84e4bdc07f4eefcd9054cbc 100644 (file)
--- a/drivers/gpio/gpio-rdc321x.c
+++ b/drivers/gpio/gpio-rdc321x.c
@@ -199,14 +199,11 @@ static int rdc321x_gpio_probe(struct platform_device *pdev)
 
 static int rdc321x_gpio_remove(struct platform_device *pdev)
 {
-       int ret;
        struct rdc321x_gpio *rdc321x_gpio_dev = platform_get_drvdata(pdev);
 
-       ret = gpiochip_remove(&rdc321x_gpio_dev->chip);
-       if (ret)
-               dev_err(&pdev->dev, "failed to unregister chip\n");
+       gpiochip_remove(&rdc321x_gpio_dev->chip);
 
-       return ret;
+       return 0;
 }
 
 static struct platform_driver rdc321x_gpio_driver = {

diff --git a/drivers/gpio/gpio-sch.c b/drivers/gpio/gpio-sch.c
index a9b1cd16c848317e887523363516bb465788180c..41e91d70301e400e7a7b35a52e11135203a584d1 100644 (file)
--- a/drivers/gpio/gpio-sch.c
+++ b/drivers/gpio/gpio-sch.c
@@ -290,8 +290,7 @@ static int sch_gpio_probe(struct platform_device *pdev)
        return 0;
 
 err_sch_gpio_resume:
-       if (gpiochip_remove(&sch_gpio_core))
-               dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__);
+       gpiochip_remove(&sch_gpio_core);
 
 err_sch_gpio_core:
        release_region(res->start, resource_size(res));
@@ -304,23 +303,14 @@ static int sch_gpio_remove(struct platform_device *pdev)
 {
        struct resource *res;
        if (gpio_ba) {
-               int err;
 
-               err  = gpiochip_remove(&sch_gpio_core);
-               if (err)
-                       dev_err(&pdev->dev, "%s failed, %d\n",
-                               "gpiochip_remove()", err);
-               err = gpiochip_remove(&sch_gpio_resume);
-               if (err)
-                       dev_err(&pdev->dev, "%s failed, %d\n",
-                               "gpiochip_remove()", err);
+               gpiochip_remove(&sch_gpio_core);
+               gpiochip_remove(&sch_gpio_resume);
 
                res = platform_get_resource(pdev, IORESOURCE_IO, 0);
 
                release_region(res->start, resource_size(res));
                gpio_ba = 0;
-
-               return err;
        }
 
        return 0;

diff --git a/drivers/gpio/gpio-sch311x.c b/drivers/gpio/gpio-sch311x.c
index f942b80ee403fb1499dfa21323a2c1edd7e12e81..0cb11413e8142b977817aadb29d8b5449bc4cfe5 100644 (file)
--- a/drivers/gpio/gpio-sch311x.c
+++ b/drivers/gpio/gpio-sch311x.c
@@ -291,14 +291,12 @@ static int sch311x_gpio_remove(struct platform_device *pdev)
 {
        struct sch311x_pdev_data *pdata = pdev->dev.platform_data;
        struct sch311x_gpio_priv *priv = platform_get_drvdata(pdev);
-       int err, i;
+       int i;
 
        release_region(pdata->runtime_reg + GP1, 6);
 
        for (i = 0; i < ARRAY_SIZE(priv->blocks); i++) {
-               err = gpiochip_remove(&priv->blocks[i].chip);
-               if (err)
-                       return err;
+               gpiochip_remove(&priv->blocks[i].chip);
                dev_info(&pdev->dev,
                         "SMSC SCH311x GPIO block %d unregistered.\n", i);
        }

diff --git a/drivers/gpio/gpio-sodaville.c b/drivers/gpio/gpio-sodaville.c
index 7c6c518929bc81077e09082ee59bfef39b0a0a4e..d8da36cd8123e0111197c98a106661266f32f90d 100644 (file)
--- a/drivers/gpio/gpio-sodaville.c
+++ b/drivers/gpio/gpio-sodaville.c
@@ -265,9 +265,7 @@ static void sdv_gpio_remove(struct pci_dev *pdev)
        free_irq(pdev->irq, sd);
        irq_free_descs(sd->irq_base, SDV_NUM_PUB_GPIOS);
 
-       if (gpiochip_remove(&sd->bgpio.gc))
-               dev_err(&pdev->dev, "gpiochip_remove() failed.\n");
-
+       gpiochip_remove(&sd->bgpio.gc);
        pci_release_region(pdev, GPIO_BAR);
        iounmap(sd->gpio_pub_base);
        pci_disable_device(pdev);

diff --git a/drivers/gpio/gpio-stmpe.c b/drivers/gpio/gpio-stmpe.c
index ed90adbdb1286a312d55fc096b847977e34af4dd..845025a57240ac3517c7401c3bbe7c0f7c4ebe8a 100644 (file)
--- a/drivers/gpio/gpio-stmpe.c
+++ b/drivers/gpio/gpio-stmpe.c
@@ -353,17 +353,11 @@ static int stmpe_gpio_remove(struct platform_device *pdev)
        struct stmpe_gpio *stmpe_gpio = platform_get_drvdata(pdev);
        struct stmpe *stmpe = stmpe_gpio->stmpe;
        struct stmpe_gpio_platform_data *pdata = stmpe->pdata->gpio;
-       int ret;
 
        if (pdata && pdata->remove)
                pdata->remove(stmpe, stmpe_gpio->chip.base);
 
-       ret = gpiochip_remove(&stmpe_gpio->chip);
-       if (ret < 0) {
-               dev_err(stmpe_gpio->dev,
-                       "unable to remove gpiochip: %d\n", ret);
-               return ret;
-       }
+       gpiochip_remove(&stmpe_gpio->chip);
 
        stmpe_disable(stmpe, STMPE_BLOCK_GPIO);
 

diff --git a/drivers/gpio/gpio-sx150x.c b/drivers/gpio/gpio-sx150x.c
index b51ca9f5c14018e3213aed4ccdf38c7a3d52a8f1..bce6c6108f2022623d5769d6a3e0a8b20ca1a5bc 100644 (file)
--- a/drivers/gpio/gpio-sx150x.c
+++ b/drivers/gpio/gpio-sx150x.c
@@ -615,19 +615,16 @@ static int sx150x_probe(struct i2c_client *client,
 
        return 0;
 probe_fail_post_gpiochip_add:
-       WARN_ON(gpiochip_remove(&chip->gpio_chip) < 0);
+       gpiochip_remove(&chip->gpio_chip);
        return rc;
 }
 
 static int sx150x_remove(struct i2c_client *client)
 {
        struct sx150x_chip *chip;
-       int rc;
 
        chip = i2c_get_clientdata(client);
-       rc = gpiochip_remove(&chip->gpio_chip);
-       if (rc < 0)
-               return rc;
+       gpiochip_remove(&chip->gpio_chip);
 
        if (chip->irq_summary >= 0)
                sx150x_remove_irq_chip(chip);

diff --git a/drivers/gpio/gpio-syscon.c b/drivers/gpio/gpio-syscon.c
index b50fe1297748cc2e0df6898b13d790aaa0971e08..30884fbc750de5e74f7322a415bfab7650185e2d 100644 (file)
--- a/drivers/gpio/gpio-syscon.c
+++ b/drivers/gpio/gpio-syscon.c
@@ -172,7 +172,8 @@ static int syscon_gpio_remove(struct platform_device *pdev)
 {
        struct syscon_gpio_priv *priv = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&priv->chip);
+       gpiochip_remove(&priv->chip);
+       return 0;
 }
 
 static struct platform_driver syscon_gpio_driver = {

diff --git a/drivers/gpio/gpio-tb10x.c b/drivers/gpio/gpio-tb10x.c
index 07bce97647a684901db5c8e10f7b5d96072909af..9e615be8032ce5a328d777a1808b3d55ba5e78d8 100644 (file)
--- a/drivers/gpio/gpio-tb10x.c
+++ b/drivers/gpio/gpio-tb10x.c
@@ -291,7 +291,6 @@ fail_ioremap:
 static int __exit tb10x_gpio_remove(struct platform_device *pdev)
 {
        struct tb10x_gpio *tb10x_gpio = platform_get_drvdata(pdev);
-       int ret;
 
        if (tb10x_gpio->gc.to_irq) {
                irq_remove_generic_chip(tb10x_gpio->domain->gc->gc[0],
@@ -300,9 +299,7 @@ static int __exit tb10x_gpio_remove(struct platform_device *pdev)
                irq_domain_remove(tb10x_gpio->domain);
                free_irq(tb10x_gpio->irq, tb10x_gpio);
        }
-       ret = gpiochip_remove(&tb10x_gpio->gc);
-       if (ret)
-               return ret;
+       gpiochip_remove(&tb10x_gpio->gc);
 
        return 0;
 }

diff --git a/drivers/gpio/gpio-tc3589x.c b/drivers/gpio/gpio-tc3589x.c
index 51f7cbd9ff713cc9d3c52a9f7e4565f5ceb68554..7324869c38e0a01d82444da901ecaef719b8469e 100644 (file)
--- a/drivers/gpio/gpio-tc3589x.c
+++ b/drivers/gpio/gpio-tc3589x.c
@@ -313,17 +313,11 @@ static int tc3589x_gpio_remove(struct platform_device *pdev)
        struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev);
        struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
        struct tc3589x_gpio_platform_data *pdata = tc3589x->pdata->gpio;
-       int ret;
 
        if (pdata && pdata->remove)
                pdata->remove(tc3589x, tc3589x_gpio->chip.base);
 
-       ret = gpiochip_remove(&tc3589x_gpio->chip);
-       if (ret < 0) {
-               dev_err(tc3589x_gpio->dev,
-                       "unable to remove gpiochip: %d\n", ret);
-               return ret;
-       }
+       gpiochip_remove(&tc3589x_gpio->chip);
 
        return 0;
 }

diff --git a/drivers/gpio/gpio-timberdale.c b/drivers/gpio/gpio-timberdale.c
index efc7c129016d1d748f9c9a837956ced99cee0471..a685a3cbbc81da371fd4863cc50149487fda3fba 100644 (file)
--- a/drivers/gpio/gpio-timberdale.c
+++ b/drivers/gpio/gpio-timberdale.c
@@ -307,7 +307,6 @@ static int timbgpio_probe(struct platform_device *pdev)
 
 static int timbgpio_remove(struct platform_device *pdev)
 {
-       int err;
        struct timbgpio_platform_data *pdata = dev_get_platdata(&pdev->dev);
        struct timbgpio *tgpio = platform_get_drvdata(pdev);
        int irq = platform_get_irq(pdev, 0);
@@ -323,9 +322,7 @@ static int timbgpio_remove(struct platform_device *pdev)
                irq_set_handler_data(irq, NULL);
        }
 
-       err = gpiochip_remove(&tgpio->gpio);
-       if (err)
-               printk(KERN_ERR DRIVER_NAME": failed to remove gpio_chip\n");
+       gpiochip_remove(&tgpio->gpio);
 
        return 0;
 }

diff --git a/drivers/gpio/gpio-tps6586x.c b/drivers/gpio/gpio-tps6586x.c
index a69fbea41253877566f19c41706c08c97c813837..9c9238e838a95eb6fe7982974b1a4889966544bc 100644 (file)
--- a/drivers/gpio/gpio-tps6586x.c
+++ b/drivers/gpio/gpio-tps6586x.c
@@ -137,7 +137,8 @@ static int tps6586x_gpio_remove(struct platform_device *pdev)
 {
        struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&tps6586x_gpio->gpio_chip);
+       gpiochip_remove(&tps6586x_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver tps6586x_gpio_driver = {

diff --git a/drivers/gpio/gpio-tps65910.c b/drivers/gpio/gpio-tps65910.c
index e2f8cda235ead0bcb3616ab63775d18d6ac55eac..88f1f5ff4e966a7ab918b102f33eb6c1857b5c62 100644 (file)
--- a/drivers/gpio/gpio-tps65910.c
+++ b/drivers/gpio/gpio-tps65910.c
@@ -190,7 +190,8 @@ static int tps65910_gpio_remove(struct platform_device *pdev)
 {
        struct tps65910_gpio *tps65910_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&tps65910_gpio->gpio_chip);
+       gpiochip_remove(&tps65910_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver tps65910_gpio_driver = {

diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c
index 59ee486cb8b918ea8e06f497d87e8e3e74c48261..22052d84c63b82a5179dc9a1a6c9b29a76f5a660 100644 (file)
--- a/drivers/gpio/gpio-tps65912.c
+++ b/drivers/gpio/gpio-tps65912.c
@@ -117,7 +117,8 @@ static int tps65912_gpio_remove(struct platform_device *pdev)
 {
        struct tps65912_gpio_data  *tps65912_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&tps65912_gpio->gpio_chip);
+       gpiochip_remove(&tps65912_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver tps65912_gpio_driver = {

diff --git a/drivers/gpio/gpio-ts5500.c b/drivers/gpio/gpio-ts5500.c
index 3df3ebdb3e5267f5e4ea1575ff9d6217a950f36a..de18591ff11e327d605299c5e457428c5f11ab12 100644 (file)
--- a/drivers/gpio/gpio-ts5500.c
+++ b/drivers/gpio/gpio-ts5500.c
@@ -427,8 +427,7 @@ static int ts5500_dio_probe(struct platform_device *pdev)
 
        return 0;
 cleanup:
-       if (gpiochip_remove(&priv->gpio_chip))
-               dev_err(dev, "failed to remove gpio chip\n");
+       gpiochip_remove(&priv->gpio_chip);
        return ret;
 }
 
@@ -437,7 +436,8 @@ static int ts5500_dio_remove(struct platform_device *pdev)
        struct ts5500_priv *priv = platform_get_drvdata(pdev);
 
        ts5500_disable_irq(priv);
-       return gpiochip_remove(&priv->gpio_chip);
+       gpiochip_remove(&priv->gpio_chip);
+       return 0;
 }
 
 static struct platform_device_id ts5500_dio_ids[] = {

diff --git a/drivers/gpio/gpio-twl4030.c b/drivers/gpio/gpio-twl4030.c
index 826da37052d74813ecc28f46769034e5423fb25a..118828b3736fccd337bcaca90f65e19935809078 100644 (file)
--- a/drivers/gpio/gpio-twl4030.c
+++ b/drivers/gpio/gpio-twl4030.c
@@ -583,9 +583,7 @@ static int gpio_twl4030_remove(struct platform_device *pdev)
                }
        }
 
-       status = gpiochip_remove(&priv->gpio_chip);
-       if (status < 0)
-               return status;
+       gpiochip_remove(&priv->gpio_chip);
 
        if (is_module())
                return 0;

diff --git a/drivers/gpio/gpio-twl6040.c b/drivers/gpio/gpio-twl6040.c
index 0caf5cd1b47d5f87298edc2c1d859dfa2e6a4dbf..f28e04b88aa9c89d3b7751b837951d5da3caa811 100644 (file)
--- a/drivers/gpio/gpio-twl6040.c
+++ b/drivers/gpio/gpio-twl6040.c
@@ -111,7 +111,8 @@ static int gpo_twl6040_probe(struct platform_device *pdev)
 
 static int gpo_twl6040_remove(struct platform_device *pdev)
 {
-       return gpiochip_remove(&twl6040gpo_chip);
+       gpiochip_remove(&twl6040gpo_chip);
+       return 0;
 }
 
 /* Note:  this hardware lives inside an I2C-based multi-function device. */

diff --git a/drivers/gpio/gpio-ucb1400.c b/drivers/gpio/gpio-ucb1400.c
index d520dc9ed7090d9951e31c33ca8b7cd498fc0071..d502825159b9b4925e4e129f02fd5a7da7f3bc96 100644 (file)
--- a/drivers/gpio/gpio-ucb1400.c
+++ b/drivers/gpio/gpio-ucb1400.c
@@ -89,7 +89,7 @@ static int ucb1400_gpio_remove(struct platform_device *dev)
                        return err;
        }
 
-       err = gpiochip_remove(&ucb->gc);
+       gpiochip_remove(&ucb->gc);
        return err;
 }
 

diff --git a/drivers/gpio/gpio-viperboard.c b/drivers/gpio/gpio-viperboard.c
index 79e3b5836712b1fbbbff1c638751fa761ce3a480..e2a11f27807fcd0b23b7c0ecfc11d5690466edfa 100644 (file)
--- a/drivers/gpio/gpio-viperboard.c
+++ b/drivers/gpio/gpio-viperboard.c
@@ -446,8 +446,7 @@ static int vprbrd_gpio_probe(struct platform_device *pdev)
        return ret;
 
 err_gpiob:
-       if (gpiochip_remove(&vb_gpio->gpioa))
-               dev_err(&pdev->dev, "%s gpiochip_remove failed\n", __func__);
+       gpiochip_remove(&vb_gpio->gpioa);
 
 err_gpioa:
        return ret;
@@ -456,13 +455,10 @@ err_gpioa:
 static int vprbrd_gpio_remove(struct platform_device *pdev)
 {
        struct vprbrd_gpio *vb_gpio = platform_get_drvdata(pdev);
-       int ret;
 
-       ret = gpiochip_remove(&vb_gpio->gpiob);
-       if (ret == 0)
-               ret = gpiochip_remove(&vb_gpio->gpioa);
+       gpiochip_remove(&vb_gpio->gpiob);
 
-       return ret;
+       return 0;
 }
 
 static struct platform_driver vprbrd_gpio_driver = {

diff --git a/drivers/gpio/gpio-vx855.c b/drivers/gpio/gpio-vx855.c
index 0fd23b6a753d92576c7b6e09c467aff5f59129e8..85971d4e23c17b415d652ef96faaf922b78dc887 100644 (file)
--- a/drivers/gpio/gpio-vx855.c
+++ b/drivers/gpio/gpio-vx855.c
@@ -288,8 +288,7 @@ static int vx855gpio_remove(struct platform_device *pdev)
        struct vx855_gpio *vg = platform_get_drvdata(pdev);
        struct resource *res;
 
-       if (gpiochip_remove(&vg->gpio))
-               dev_err(&pdev->dev, "unable to remove gpio_chip?\n");
+       gpiochip_remove(&vg->gpio);
 
        if (vg->gpi_reserved) {
                res = platform_get_resource(pdev, IORESOURCE_IO, 0);

diff --git a/drivers/gpio/gpio-wm831x.c b/drivers/gpio/gpio-wm831x.c
index b18a1a26425ed81e1c676af88d8c5b7c4ca4e8bd..58ce75c188b71106a86d19ff49f429cee2c57115 100644 (file)
--- a/drivers/gpio/gpio-wm831x.c
+++ b/drivers/gpio/gpio-wm831x.c
@@ -279,7 +279,8 @@ static int wm831x_gpio_remove(struct platform_device *pdev)
 {
        struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev);
 
-       return  gpiochip_remove(&wm831x_gpio->gpio_chip);
+       gpiochip_remove(&wm831x_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver wm831x_gpio_driver = {

diff --git a/drivers/gpio/gpio-wm8350.c b/drivers/gpio/gpio-wm8350.c
index 2487f9d575d3013681274a46688864a4d6b3ec52..060b89303bb6125e28919a4c31f032adf6d7ed0a 100644 (file)
--- a/drivers/gpio/gpio-wm8350.c
+++ b/drivers/gpio/gpio-wm8350.c
@@ -145,7 +145,8 @@ static int wm8350_gpio_remove(struct platform_device *pdev)
 {
        struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&wm8350_gpio->gpio_chip);
+       gpiochip_remove(&wm8350_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver wm8350_gpio_driver = {

diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c
index d93b6b581677cada67fba27bed58a66ef1ed89ad..6f5e42db4b9e30f8a4254b3c68b66cd6d2a5b206 100644 (file)
--- a/drivers/gpio/gpio-wm8994.c
+++ b/drivers/gpio/gpio-wm8994.c
@@ -285,7 +285,8 @@ static int wm8994_gpio_remove(struct platform_device *pdev)
 {
        struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);
 
-       return gpiochip_remove(&wm8994_gpio->gpio_chip);
+       gpiochip_remove(&wm8994_gpio->gpio_chip);
+       return 0;
 }
 
 static struct platform_driver wm8994_gpio_driver = {