Skip to content

L
linux
Commit 206210ce authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

gpio: remove use of __devexit 

CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.
Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Grant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: Peter Tyser <ptyser@xes-inc.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b5ba78de
Show whitespace changes
Inline Side-by-side
Showing with 39 additions and 39 deletions
drivers/gpio/gpio-74x164.c
View file @ 206210ce
...@@ -181,7 +181,7 @@ static int gen_74x164_probe(struct spi_device *spi) ...@@ -181,7 +181,7 @@ static int gen_74x164_probe(struct spi_device *spi)
return ret; return ret;
} }
static int __devexit gen_74x164_remove(struct spi_device *spi) static int gen_74x164_remove(struct spi_device *spi)
{ {
struct gen_74x164_chip *chip; struct gen_74x164_chip *chip;
int ret; int ret;
......
drivers/gpio/gpio-ab8500.c
View file @ 206210ce
...@@ -474,7 +474,7 @@ static int ab8500_gpio_probe(struct platform_device *pdev) ...@@ -474,7 +474,7 @@ static int ab8500_gpio_probe(struct platform_device *pdev)
* ab8500_gpio_remove() - remove Ab8500-gpio driver * ab8500_gpio_remove() - remove Ab8500-gpio driver
* @pdev : Platform device registered * @pdev : Platform device registered
*/ */
static int __devexit ab8500_gpio_remove(struct platform_device *pdev) static int ab8500_gpio_remove(struct platform_device *pdev)
{ {
struct ab8500_gpio *ab8500_gpio = platform_get_drvdata(pdev); struct ab8500_gpio *ab8500_gpio = platform_get_drvdata(pdev);
int ret; int ret;
......
drivers/gpio/gpio-adnp.c
View file @ 206210ce
...@@ -563,7 +563,7 @@ static int adnp_i2c_probe(struct i2c_client *client, ...@@ -563,7 +563,7 @@ static int adnp_i2c_probe(struct i2c_client *client,
return err; return err;
} }
static __devexit int adnp_i2c_remove(struct i2c_client *client) static int adnp_i2c_remove(struct i2c_client *client)
{ {
struct adnp *adnp = i2c_get_clientdata(client); struct adnp *adnp = i2c_get_clientdata(client);
struct device_node *np = client->dev.of_node; struct device_node *np = client->dev.of_node;
......
drivers/gpio/gpio-adp5520.c
View file @ 206210ce
...@@ -167,7 +167,7 @@ static int adp5520_gpio_probe(struct platform_device *pdev) ...@@ -167,7 +167,7 @@ static int adp5520_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit adp5520_gpio_remove(struct platform_device *pdev) static int adp5520_gpio_remove(struct platform_device *pdev)
{ {
struct adp5520_gpio *dev; struct adp5520_gpio *dev;
int ret; int ret;
......
drivers/gpio/gpio-adp5588.c
View file @ 206210ce
...@@ -438,7 +438,7 @@ static int adp5588_gpio_probe(struct i2c_client *client, ...@@ -438,7 +438,7 @@ static int adp5588_gpio_probe(struct i2c_client *client,
return ret; return ret;
} }
static int __devexit adp5588_gpio_remove(struct i2c_client *client) static int adp5588_gpio_remove(struct i2c_client *client)
{ {
struct adp5588_gpio_platform_data *pdata = client->dev.platform_data; struct adp5588_gpio_platform_data *pdata = client->dev.platform_data;
struct adp5588_gpio *dev = i2c_get_clientdata(client); struct adp5588_gpio *dev = i2c_get_clientdata(client);
......
drivers/gpio/gpio-arizona.c
View file @ 206210ce
...@@ -141,7 +141,7 @@ static int arizona_gpio_probe(struct platform_device *pdev) ...@@ -141,7 +141,7 @@ static int arizona_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit arizona_gpio_remove(struct platform_device *pdev) static int arizona_gpio_remove(struct platform_device *pdev)
{ {
struct arizona_gpio *arizona_gpio = platform_get_drvdata(pdev); struct arizona_gpio *arizona_gpio = platform_get_drvdata(pdev);
......
drivers/gpio/gpio-cs5535.c
View file @ 206210ce
...@@ -355,7 +355,7 @@ static int cs5535_gpio_probe(struct platform_device *pdev) ...@@ -355,7 +355,7 @@ static int cs5535_gpio_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit cs5535_gpio_remove(struct platform_device *pdev) static int cs5535_gpio_remove(struct platform_device *pdev)
{ {
struct resource *r; struct resource *r;
int err; int err;
......
drivers/gpio/gpio-da9052.c
View file @ 206210ce
...@@ -229,7 +229,7 @@ static int da9052_gpio_probe(struct platform_device *pdev) ...@@ -229,7 +229,7 @@ static int da9052_gpio_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __devexit da9052_gpio_remove(struct platform_device *pdev) static int da9052_gpio_remove(struct platform_device *pdev)
{ {
struct da9052_gpio *gpio = platform_get_drvdata(pdev); struct da9052_gpio *gpio = platform_get_drvdata(pdev);
......
drivers/gpio/gpio-em.c
View file @ 206210ce
...@@ -375,7 +375,7 @@ static int em_gio_probe(struct platform_device *pdev) ...@@ -375,7 +375,7 @@ static int em_gio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit em_gio_remove(struct platform_device *pdev) static int em_gio_remove(struct platform_device *pdev)
{ {
struct em_gio_priv *p = platform_get_drvdata(pdev); struct em_gio_priv *p = platform_get_drvdata(pdev);
struct resource *irq[2]; struct resource *irq[2];
......
drivers/gpio/gpio-generic.c
View file @ 206210ce
...@@ -507,7 +507,7 @@ static int bgpio_pdev_probe(struct platform_device *pdev) ...@@ -507,7 +507,7 @@ static int bgpio_pdev_probe(struct platform_device *pdev)
return gpiochip_add(&bgc->gc); return gpiochip_add(&bgc->gc);
} }
static int __devexit bgpio_pdev_remove(struct platform_device *pdev) static int bgpio_pdev_remove(struct platform_device *pdev)
{ {
struct bgpio_chip *bgc = platform_get_drvdata(pdev); struct bgpio_chip *bgc = platform_get_drvdata(pdev);
......
drivers/gpio/gpio-ich.c
View file @ 206210ce
...@@ -442,7 +442,7 @@ static int ichx_gpio_probe(struct platform_device *pdev) ...@@ -442,7 +442,7 @@ static int ichx_gpio_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit ichx_gpio_remove(struct platform_device *pdev) static int ichx_gpio_remove(struct platform_device *pdev)
{ {
int err; int err;
......
drivers/gpio/gpio-janz-ttl.c
View file @ 206210ce
...@@ -211,7 +211,7 @@ static int ttl_probe(struct platform_device *pdev) ...@@ -211,7 +211,7 @@ static int ttl_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit ttl_remove(struct platform_device *pdev) static int ttl_remove(struct platform_device *pdev)
{ {
struct ttl_module *mod = platform_get_drvdata(pdev); struct ttl_module *mod = platform_get_drvdata(pdev);
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
......
drivers/gpio/gpio-langwell.c
View file @ 206210ce
...@@ -484,7 +484,7 @@ static int wp_gpio_probe(struct platform_device *pdev) ...@@ -484,7 +484,7 @@ static int wp_gpio_probe(struct platform_device *pdev)
return retval; return retval;
} }
static int __devexit wp_gpio_remove(struct platform_device *pdev) static int wp_gpio_remove(struct platform_device *pdev)
{ {
struct lnw_gpio *lnw = platform_get_drvdata(pdev); struct lnw_gpio *lnw = platform_get_drvdata(pdev);
int err; int err;
......
drivers/gpio/gpio-max7300.c
View file @ 206210ce
...@@ -55,7 +55,7 @@ static int max7300_probe(struct i2c_client *client, ...@@ -55,7 +55,7 @@ static int max7300_probe(struct i2c_client *client,
return ret; return ret;
} }
static int __devexit max7300_remove(struct i2c_client *client) static int max7300_remove(struct i2c_client *client)
{ {
return __max730x_remove(&client->dev); return __max730x_remove(&client->dev);
} }
......
drivers/gpio/gpio-max7301.c
View file @ 206210ce
...@@ -75,7 +75,7 @@ static int max7301_probe(struct spi_device *spi) ...@@ -75,7 +75,7 @@ static int max7301_probe(struct spi_device *spi)
return ret; return ret;
} }
static int __devexit max7301_remove(struct spi_device *spi) static int max7301_remove(struct spi_device *spi)
{ {
return __max730x_remove(&spi->dev); return __max730x_remove(&spi->dev);
} }
......
drivers/gpio/gpio-max730x.c
View file @ 206210ce
...@@ -226,7 +226,7 @@ int __max730x_probe(struct max7301 *ts) ...@@ -226,7 +226,7 @@ int __max730x_probe(struct max7301 *ts)
} }
EXPORT_SYMBOL_GPL(__max730x_probe); EXPORT_SYMBOL_GPL(__max730x_probe);
int __devexit __max730x_remove(struct device *dev) int __max730x_remove(struct device *dev)
{ {
struct max7301 *ts = dev_get_drvdata(dev); struct max7301 *ts = dev_get_drvdata(dev);
int ret; int ret;
......
drivers/gpio/gpio-max732x.c
View file @ 206210ce
...@@ -651,7 +651,7 @@ static int max732x_probe(struct i2c_client *client, ...@@ -651,7 +651,7 @@ static int max732x_probe(struct i2c_client *client,
return ret; return ret;
} }
static int __devexit max732x_remove(struct i2c_client *client) static int max732x_remove(struct i2c_client *client)
{ {
struct max732x_platform_data *pdata = client->dev.platform_data; struct max732x_platform_data *pdata = client->dev.platform_data;
struct max732x_chip *chip = i2c_get_clientdata(client); struct max732x_chip *chip = i2c_get_clientdata(client);
......
drivers/gpio/gpio-mc33880.c
View file @ 206210ce
...@@ -147,7 +147,7 @@ static int mc33880_probe(struct spi_device *spi) ...@@ -147,7 +147,7 @@ static int mc33880_probe(struct spi_device *spi)
return ret; return ret;
} }
static int __devexit mc33880_remove(struct spi_device *spi) static int mc33880_remove(struct spi_device *spi)
{ {
struct mc33880 *mc; struct mc33880 *mc;
int ret; int ret;
......
drivers/gpio/gpio-mcp23s08.c
View file @ 206210ce
...@@ -508,7 +508,7 @@ static int mcp230xx_probe(struct i2c_client *client, ...@@ -508,7 +508,7 @@ static int mcp230xx_probe(struct i2c_client *client,
return status; return status;
} }
static int __devexit mcp230xx_remove(struct i2c_client *client) static int mcp230xx_remove(struct i2c_client *client)
{ {
struct mcp23s08 *mcp = i2c_get_clientdata(client); struct mcp23s08 *mcp = i2c_get_clientdata(client);
int status; int status;
......
drivers/gpio/gpio-ml-ioh.c
View file @ 206210ce
...@@ -517,7 +517,7 @@ static int ioh_gpio_probe(struct pci_dev *pdev, ...@@ -517,7 +517,7 @@ static int ioh_gpio_probe(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit ioh_gpio_remove(struct pci_dev *pdev) static void ioh_gpio_remove(struct pci_dev *pdev)
{ {
int err; int err;
int i; int i;
......
drivers/gpio/gpio-msm-v2.c
View file @ 206210ce
...@@ -376,7 +376,7 @@ static int msm_gpio_probe(struct platform_device *dev) ...@@ -376,7 +376,7 @@ static int msm_gpio_probe(struct platform_device *dev)
return 0; return 0;
} }
static int __devexit msm_gpio_remove(struct platform_device *dev) static int msm_gpio_remove(struct platform_device *dev)
{ {
int ret = gpiochip_remove(&msm_gpio.gpio_chip); int ret = gpiochip_remove(&msm_gpio.gpio_chip);
......
drivers/gpio/gpio-pch.c
View file @ 206210ce
...@@ -442,7 +442,7 @@ static int pch_gpio_probe(struct pci_dev *pdev, ...@@ -442,7 +442,7 @@ static int pch_gpio_probe(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit pch_gpio_remove(struct pci_dev *pdev) static void pch_gpio_remove(struct pci_dev *pdev)
{ {
int err; int err;
struct pch_gpio *chip = pci_get_drvdata(pdev); struct pch_gpio *chip = pci_get_drvdata(pdev);
......
drivers/gpio/gpio-rc5t583.c
View file @ 206210ce
...@@ -146,7 +146,7 @@ static int rc5t583_gpio_probe(struct platform_device *pdev) ...@@ -146,7 +146,7 @@ static int rc5t583_gpio_probe(struct platform_device *pdev)
return gpiochip_add(&rc5t583_gpio->gpio_chip); return gpiochip_add(&rc5t583_gpio->gpio_chip);
} }
static int __devexit rc5t583_gpio_remove(struct platform_device *pdev) static int rc5t583_gpio_remove(struct platform_device *pdev)
{ {
struct rc5t583_gpio *rc5t583_gpio = platform_get_drvdata(pdev); struct rc5t583_gpio *rc5t583_gpio = platform_get_drvdata(pdev);
......
drivers/gpio/gpio-rdc321x.c
View file @ 206210ce
...@@ -206,7 +206,7 @@ static int rdc321x_gpio_probe(struct platform_device *pdev) ...@@ -206,7 +206,7 @@ static int rdc321x_gpio_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit rdc321x_gpio_remove(struct platform_device *pdev) static int rdc321x_gpio_remove(struct platform_device *pdev)
{ {
int ret; int ret;
struct rdc321x_gpio *rdc321x_gpio_dev = platform_get_drvdata(pdev); struct rdc321x_gpio *rdc321x_gpio_dev = platform_get_drvdata(pdev);
......
drivers/gpio/gpio-sch.c
View file @ 206210ce
...@@ -271,7 +271,7 @@ static int sch_gpio_probe(struct platform_device *pdev) ...@@ -271,7 +271,7 @@ static int sch_gpio_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit sch_gpio_remove(struct platform_device *pdev) static int sch_gpio_remove(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
if (gpio_ba) { if (gpio_ba) {
......
drivers/gpio/gpio-stmpe.c
View file @ 206210ce
...@@ -378,7 +378,7 @@ static int stmpe_gpio_probe(struct platform_device *pdev) ...@@ -378,7 +378,7 @@ static int stmpe_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit stmpe_gpio_remove(struct platform_device *pdev) static int stmpe_gpio_remove(struct platform_device *pdev)
{ {
struct stmpe_gpio *stmpe_gpio = platform_get_drvdata(pdev); struct stmpe_gpio *stmpe_gpio = platform_get_drvdata(pdev);
struct stmpe *stmpe = stmpe_gpio->stmpe; struct stmpe *stmpe = stmpe_gpio->stmpe;
......
drivers/gpio/gpio-sx150x.c
View file @ 206210ce
...@@ -622,7 +622,7 @@ static int sx150x_probe(struct i2c_client *client, ...@@ -622,7 +622,7 @@ static int sx150x_probe(struct i2c_client *client,
return rc; return rc;
} }
static int __devexit sx150x_remove(struct i2c_client *client) static int sx150x_remove(struct i2c_client *client)
{ {
struct sx150x_chip *chip; struct sx150x_chip *chip;
int rc; int rc;
......
drivers/gpio/gpio-tc3589x.c
View file @ 206210ce
...@@ -389,7 +389,7 @@ static int tc3589x_gpio_probe(struct platform_device *pdev) ...@@ -389,7 +389,7 @@ static int tc3589x_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit tc3589x_gpio_remove(struct platform_device *pdev) static int tc3589x_gpio_remove(struct platform_device *pdev)
{ {
struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev); struct tc3589x_gpio *tc3589x_gpio = platform_get_drvdata(pdev);
struct tc3589x *tc3589x = tc3589x_gpio->tc3589x; struct tc3589x *tc3589x = tc3589x_gpio->tc3589x;
......
drivers/gpio/gpio-timberdale.c
View file @ 206210ce
...@@ -316,7 +316,7 @@ static int timbgpio_probe(struct platform_device *pdev) ...@@ -316,7 +316,7 @@ static int timbgpio_probe(struct platform_device *pdev)
return err; return err;
} }
static int __devexit timbgpio_remove(struct platform_device *pdev) static int timbgpio_remove(struct platform_device *pdev)
{ {
int err; int err;
struct timbgpio_platform_data *pdata = pdev->dev.platform_data; struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
......
drivers/gpio/gpio-tps6586x.c
View file @ 206210ce
...@@ -126,7 +126,7 @@ static int tps6586x_gpio_probe(struct platform_device *pdev) ...@@ -126,7 +126,7 @@ static int tps6586x_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit tps6586x_gpio_remove(struct platform_device *pdev) static int tps6586x_gpio_remove(struct platform_device *pdev)
{ {
struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev); struct tps6586x_gpio *tps6586x_gpio = platform_get_drvdata(pdev);
......
drivers/gpio/gpio-tps65910.c
View file @ 206210ce
...@@ -188,7 +188,7 @@ static int tps65910_gpio_probe(struct platform_device *pdev) ...@@ -188,7 +188,7 @@ static int tps65910_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit tps65910_gpio_remove(struct platform_device *pdev) static int tps65910_gpio_remove(struct platform_device *pdev)
{ {
struct tps65910_gpio *tps65910_gpio = platform_get_drvdata(pdev); struct tps65910_gpio *tps65910_gpio = platform_get_drvdata(pdev);
......
drivers/gpio/gpio-tps65912.c
View file @ 206210ce
...@@ -113,7 +113,7 @@ static int tps65912_gpio_probe(struct platform_device *pdev) ...@@ -113,7 +113,7 @@ static int tps65912_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit tps65912_gpio_remove(struct platform_device *pdev) static int tps65912_gpio_remove(struct platform_device *pdev)
{ {
struct tps65912_gpio_data *tps65912_gpio = platform_get_drvdata(pdev); struct tps65912_gpio_data *tps65912_gpio = platform_get_drvdata(pdev);
......
drivers/gpio/gpio-twl4030.c
View file @ 206210ce
...@@ -505,7 +505,7 @@ static int gpio_twl4030_probe(struct platform_device *pdev) ...@@ -505,7 +505,7 @@ static int gpio_twl4030_probe(struct platform_device *pdev)
return ret; return ret;
} }
/* Cannot use __devexit as gpio_twl4030_probe() calls us */ /* Cannot use as gpio_twl4030_probe() calls us */
static int gpio_twl4030_remove(struct platform_device *pdev) static int gpio_twl4030_remove(struct platform_device *pdev)
{ {
struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data; struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
......
drivers/gpio/gpio-twl6040.c
View file @ 206210ce
...@@ -113,7 +113,7 @@ static int gpo_twl6040_probe(struct platform_device *pdev) ...@@ -113,7 +113,7 @@ static int gpo_twl6040_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit gpo_twl6040_remove(struct platform_device *pdev) static int gpo_twl6040_remove(struct platform_device *pdev)
{ {
return gpiochip_remove(&twl6040gpo_chip); return gpiochip_remove(&twl6040gpo_chip);
} }
......
drivers/gpio/gpio-vr41xx.c
View file @ 206210ce
...@@ -552,7 +552,7 @@ static int giu_probe(struct platform_device *pdev) ...@@ -552,7 +552,7 @@ static int giu_probe(struct platform_device *pdev)
return cascade_irq(irq, giu_get_irq); return cascade_irq(irq, giu_get_irq);
} }
static int __devexit giu_remove(struct platform_device *pdev) static int giu_remove(struct platform_device *pdev)
{ {
if (giu_base) { if (giu_base) {
iounmap(giu_base); iounmap(giu_base);
......
drivers/gpio/gpio-vx855.c
View file @ 206210ce
...@@ -284,7 +284,7 @@ static int vx855gpio_probe(struct platform_device *pdev) ...@@ -284,7 +284,7 @@ static int vx855gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit vx855gpio_remove(struct platform_device *pdev) static int vx855gpio_remove(struct platform_device *pdev)
{ {
struct vx855_gpio *vg = platform_get_drvdata(pdev); struct vx855_gpio *vg = platform_get_drvdata(pdev);
struct resource *res; struct resource *res;
......
drivers/gpio/gpio-wm831x.c
View file @ 206210ce
...@@ -275,7 +275,7 @@ static int wm831x_gpio_probe(struct platform_device *pdev) ...@@ -275,7 +275,7 @@ static int wm831x_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit wm831x_gpio_remove(struct platform_device *pdev) static int wm831x_gpio_remove(struct platform_device *pdev)
{ {
struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev); struct wm831x_gpio *wm831x_gpio = platform_get_drvdata(pdev);
......
drivers/gpio/gpio-wm8350.c
View file @ 206210ce
...@@ -141,7 +141,7 @@ static int wm8350_gpio_probe(struct platform_device *pdev) ...@@ -141,7 +141,7 @@ static int wm8350_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit wm8350_gpio_remove(struct platform_device *pdev) static int wm8350_gpio_remove(struct platform_device *pdev)
{ {
struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev); struct wm8350_gpio_data *wm8350_gpio = platform_get_drvdata(pdev);
......
drivers/gpio/gpio-wm8994.c
View file @ 206210ce
...@@ -281,7 +281,7 @@ static int wm8994_gpio_probe(struct platform_device *pdev) ...@@ -281,7 +281,7 @@ static int wm8994_gpio_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit wm8994_gpio_remove(struct platform_device *pdev) static int wm8994_gpio_remove(struct platform_device *pdev)
{ {
struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev); struct wm8994_gpio *wm8994_gpio = platform_get_drvdata(pdev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7