Commit 206210ce authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

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
......@@ -181,7 +181,7 @@ exit_destroy:
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;
int ret;
......
......@@ -474,7 +474,7 @@ out_free:
* ab8500_gpio_remove() - remove Ab8500-gpio driver
* @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);
int ret;
......
......@@ -563,7 +563,7 @@ teardown:
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 device_node *np = client->dev.of_node;
......
......@@ -167,7 +167,7 @@ err:
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;
int ret;
......
......@@ -438,7 +438,7 @@ err:
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 *dev = i2c_get_clientdata(client);
......
......@@ -141,7 +141,7 @@ err:
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);
......
......@@ -355,7 +355,7 @@ done:
return err;
}
static int __devexit cs5535_gpio_remove(struct platform_device *pdev)
static int cs5535_gpio_remove(struct platform_device *pdev)
{
struct resource *r;
int err;
......
......@@ -229,7 +229,7 @@ static int da9052_gpio_probe(struct platform_device *pdev)
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);
......
......@@ -375,7 +375,7 @@ err0:
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 resource *irq[2];
......
......@@ -507,7 +507,7 @@ static int bgpio_pdev_probe(struct platform_device *pdev)
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);
......
......@@ -442,7 +442,7 @@ add_err:
return err;
}
static int __devexit ichx_gpio_remove(struct platform_device *pdev)
static int ichx_gpio_remove(struct platform_device *pdev)
{
int err;
......
......@@ -211,7 +211,7 @@ out_return:
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 device *dev = &pdev->dev;
......
......@@ -484,7 +484,7 @@ err_kmalloc:
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);
int err;
......
......@@ -55,7 +55,7 @@ static int max7300_probe(struct i2c_client *client,
return ret;
}
static int __devexit max7300_remove(struct i2c_client *client)
static int max7300_remove(struct i2c_client *client)
{
return __max730x_remove(&client->dev);
}
......
......@@ -75,7 +75,7 @@ static int max7301_probe(struct spi_device *spi)
return ret;
}
static int __devexit max7301_remove(struct spi_device *spi)
static int max7301_remove(struct spi_device *spi)
{
return __max730x_remove(&spi->dev);
}
......
......@@ -226,7 +226,7 @@ exit_destroy:
}
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);
int ret;
......
......@@ -651,7 +651,7 @@ out_failed:
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_chip *chip = i2c_get_clientdata(client);
......
......@@ -147,7 +147,7 @@ exit_destroy:
return ret;
}
static int __devexit mc33880_remove(struct spi_device *spi)
static int mc33880_remove(struct spi_device *spi)
{
struct mc33880 *mc;
int ret;
......
......@@ -508,7 +508,7 @@ fail:
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);
int status;
......
......@@ -517,7 +517,7 @@ err_pci_enable:
return ret;
}
static void __devexit ioh_gpio_remove(struct pci_dev *pdev)
static void ioh_gpio_remove(struct pci_dev *pdev)
{
int err;
int i;
......
......@@ -376,7 +376,7 @@ static int msm_gpio_probe(struct platform_device *dev)
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);
......
......@@ -442,7 +442,7 @@ err_pci_enable:
return ret;
}
static void __devexit pch_gpio_remove(struct pci_dev *pdev)
static void pch_gpio_remove(struct pci_dev *pdev)
{
int err;
struct pch_gpio *chip = pci_get_drvdata(pdev);
......
......@@ -146,7 +146,7 @@ static int rc5t583_gpio_probe(struct platform_device *pdev)
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);
......
......@@ -206,7 +206,7 @@ out_free:
return err;
}
static int __devexit rdc321x_gpio_remove(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);
......
......@@ -271,7 +271,7 @@ err_sch_gpio_core:
return err;
}
static int __devexit sch_gpio_remove(struct platform_device *pdev)
static int sch_gpio_remove(struct platform_device *pdev)
{
struct resource *res;
if (gpio_ba) {
......
......@@ -378,7 +378,7 @@ out_free:
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 *stmpe = stmpe_gpio->stmpe;
......
......@@ -622,7 +622,7 @@ probe_fail_pre_gpiochip_add:
return rc;
}
static int __devexit sx150x_remove(struct i2c_client *client)
static int sx150x_remove(struct i2c_client *client)
{
struct sx150x_chip *chip;
int rc;
......
......@@ -389,7 +389,7 @@ out_free:
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 *tc3589x = tc3589x_gpio->tc3589x;
......
......@@ -316,7 +316,7 @@ err_mem:
return err;
}
static int __devexit timbgpio_remove(struct platform_device *pdev)
static int timbgpio_remove(struct platform_device *pdev)
{
int err;
struct timbgpio_platform_data *pdata = pdev->dev.platform_data;
......
......@@ -126,7 +126,7 @@ static int tps6586x_gpio_probe(struct platform_device *pdev)
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);
......
......@@ -188,7 +188,7 @@ skip_init:
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);
......
......@@ -113,7 +113,7 @@ static int tps65912_gpio_probe(struct platform_device *pdev)
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);
......
......@@ -505,7 +505,7 @@ out:
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)
{
struct twl4030_gpio_platform_data *pdata = pdev->dev.platform_data;
......
......@@ -113,7 +113,7 @@ static int gpo_twl6040_probe(struct platform_device *pdev)
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);
}
......
......@@ -552,7 +552,7 @@ static int giu_probe(struct platform_device *pdev)
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) {
iounmap(giu_base);
......
......@@ -284,7 +284,7 @@ out_release:
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 resource *res;
......
......@@ -275,7 +275,7 @@ static int wm831x_gpio_probe(struct platform_device *pdev)
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);
......
......@@ -141,7 +141,7 @@ static int wm8350_gpio_probe(struct platform_device *pdev)
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);
......
......@@ -281,7 +281,7 @@ err:
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);
......
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