Commit 486a5c28 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

misc: 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: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: Wolfram Sang <w.sang@pengutronix.de>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b328bfec
...@@ -68,7 +68,7 @@ static int ad_dpot_i2c_probe(struct i2c_client *client, ...@@ -68,7 +68,7 @@ static int ad_dpot_i2c_probe(struct i2c_client *client,
return ad_dpot_probe(&client->dev, &bdata, id->driver_data, id->name); return ad_dpot_probe(&client->dev, &bdata, id->driver_data, id->name);
} }
static int __devexit ad_dpot_i2c_remove(struct i2c_client *client) static int ad_dpot_i2c_remove(struct i2c_client *client)
{ {
return ad_dpot_remove(&client->dev); return ad_dpot_remove(&client->dev);
} }
......
...@@ -87,7 +87,7 @@ static int ad_dpot_spi_probe(struct spi_device *spi) ...@@ -87,7 +87,7 @@ static int ad_dpot_spi_probe(struct spi_device *spi)
spi_get_device_id(spi)->name); spi_get_device_id(spi)->name);
} }
static int __devexit ad_dpot_spi_remove(struct spi_device *spi) static int ad_dpot_spi_remove(struct spi_device *spi)
{ {
return ad_dpot_remove(&spi->dev); return ad_dpot_remove(&spi->dev);
} }
......
...@@ -254,7 +254,7 @@ static int apds9802als_probe(struct i2c_client *client, ...@@ -254,7 +254,7 @@ static int apds9802als_probe(struct i2c_client *client,
return res; return res;
} }
static int __devexit apds9802als_remove(struct i2c_client *client) static int apds9802als_remove(struct i2c_client *client)
{ {
struct als_data *data = i2c_get_clientdata(client); struct als_data *data = i2c_get_clientdata(client);
......
...@@ -1181,7 +1181,7 @@ static int apds990x_probe(struct i2c_client *client, ...@@ -1181,7 +1181,7 @@ static int apds990x_probe(struct i2c_client *client,
return err; return err;
} }
static int __devexit apds990x_remove(struct i2c_client *client) static int apds990x_remove(struct i2c_client *client)
{ {
struct apds990x_chip *chip = i2c_get_clientdata(client); struct apds990x_chip *chip = i2c_get_clientdata(client);
......
...@@ -137,7 +137,7 @@ static int __init ssc_probe(struct platform_device *pdev) ...@@ -137,7 +137,7 @@ static int __init ssc_probe(struct platform_device *pdev)
return retval; return retval;
} }
static int __devexit ssc_remove(struct platform_device *pdev) static int ssc_remove(struct platform_device *pdev)
{ {
struct ssc_device *ssc = platform_get_drvdata(pdev); struct ssc_device *ssc = platform_get_drvdata(pdev);
......
...@@ -1285,7 +1285,7 @@ static int bh1770_probe(struct i2c_client *client, ...@@ -1285,7 +1285,7 @@ static int bh1770_probe(struct i2c_client *client,
return err; return err;
} }
static int __devexit bh1770_remove(struct i2c_client *client) static int bh1770_remove(struct i2c_client *client)
{ {
struct bh1770_chip *chip = i2c_get_clientdata(client); struct bh1770_chip *chip = i2c_get_clientdata(client);
......
...@@ -185,7 +185,7 @@ static int bh1780_probe(struct i2c_client *client, ...@@ -185,7 +185,7 @@ static int bh1780_probe(struct i2c_client *client,
return ret; return ret;
} }
static int __devexit bh1780_remove(struct i2c_client *client) static int bh1780_remove(struct i2c_client *client)
{ {
struct bh1780_data *ddata; struct bh1780_data *ddata;
......
...@@ -305,7 +305,7 @@ static int cb710_probe(struct pci_dev *pdev, ...@@ -305,7 +305,7 @@ static int cb710_probe(struct pci_dev *pdev,
return err; return err;
} }
static void __devexit cb710_remove_one(struct pci_dev *pdev) static void cb710_remove_one(struct pci_dev *pdev)
{ {
struct cb710_chip *chip = pci_get_drvdata(pdev); struct cb710_chip *chip = pci_get_drvdata(pdev);
unsigned long flags; unsigned long flags;
......
...@@ -656,7 +656,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -656,7 +656,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
return err; return err;
} }
static int __devexit at24_remove(struct i2c_client *client) static int at24_remove(struct i2c_client *client)
{ {
struct at24_data *at24; struct at24_data *at24;
int i; int i;
......
...@@ -459,7 +459,7 @@ static int at25_probe(struct spi_device *spi) ...@@ -459,7 +459,7 @@ static int at25_probe(struct spi_device *spi)
return err; return err;
} }
static int __devexit at25_remove(struct spi_device *spi) static int at25_remove(struct spi_device *spi)
{ {
struct at25_data *at25; struct at25_data *at25;
......
...@@ -370,7 +370,7 @@ static int eeprom_93xx46_probe(struct spi_device *spi) ...@@ -370,7 +370,7 @@ static int eeprom_93xx46_probe(struct spi_device *spi)
return err; return err;
} }
static int __devexit eeprom_93xx46_remove(struct spi_device *spi) static int eeprom_93xx46_remove(struct spi_device *spi)
{ {
struct eeprom_93xx46_dev *edev = dev_get_drvdata(&spi->dev); struct eeprom_93xx46_dev *edev = dev_get_drvdata(&spi->dev);
......
...@@ -462,7 +462,7 @@ static int fsa9480_probe(struct i2c_client *client, ...@@ -462,7 +462,7 @@ static int fsa9480_probe(struct i2c_client *client,
return ret; return ret;
} }
static int __devexit fsa9480_remove(struct i2c_client *client) static int fsa9480_remove(struct i2c_client *client)
{ {
struct fsa9480_usbsw *usbsw = i2c_get_clientdata(client); struct fsa9480_usbsw *usbsw = i2c_get_clientdata(client);
if (client->irq) if (client->irq)
......
...@@ -163,7 +163,7 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -163,7 +163,7 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
return result; return result;
} }
static void __devexit ibmasm_remove_one(struct pci_dev *pdev) static void ibmasm_remove_one(struct pci_dev *pdev)
{ {
struct service_processor *sp = (struct service_processor *)pci_get_drvdata(pdev); struct service_processor *sp = (struct service_processor *)pci_get_drvdata(pdev);
......
...@@ -415,7 +415,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) ...@@ -415,7 +415,7 @@ ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
} }
/* Removes a particular instance of an IOC4 card. */ /* Removes a particular instance of an IOC4 card. */
static void __devexit static void
ioc4_remove(struct pci_dev *pdev) ioc4_remove(struct pci_dev *pdev)
{ {
struct ioc4_submodule *is; struct ioc4_submodule *is;
......
...@@ -401,7 +401,7 @@ static int isl29003_probe(struct i2c_client *client, ...@@ -401,7 +401,7 @@ static int isl29003_probe(struct i2c_client *client,
return err; return err;
} }
static int __devexit isl29003_remove(struct i2c_client *client) static int isl29003_remove(struct i2c_client *client)
{ {
sysfs_remove_group(&client->dev.kobj, &isl29003_attr_group); sysfs_remove_group(&client->dev.kobj, &isl29003_attr_group);
isl29003_set_power_state(client, 0); isl29003_set_power_state(client, 0);
......
...@@ -191,7 +191,7 @@ static int lis3lv02d_i2c_probe(struct i2c_client *client, ...@@ -191,7 +191,7 @@ static int lis3lv02d_i2c_probe(struct i2c_client *client,
return ret; return ret;
} }
static int __devexit lis3lv02d_i2c_remove(struct i2c_client *client) static int lis3lv02d_i2c_remove(struct i2c_client *client)
{ {
struct lis3lv02d *lis3 = i2c_get_clientdata(client); struct lis3lv02d *lis3 = i2c_get_clientdata(client);
struct lis3lv02d_platform_data *pdata = client->dev.platform_data; struct lis3lv02d_platform_data *pdata = client->dev.platform_data;
......
...@@ -100,7 +100,7 @@ static int lis302dl_spi_probe(struct spi_device *spi) ...@@ -100,7 +100,7 @@ static int lis302dl_spi_probe(struct spi_device *spi)
return lis3lv02d_init_device(&lis3_dev); return lis3lv02d_init_device(&lis3_dev);
} }
static int __devexit lis302dl_spi_remove(struct spi_device *spi) static int lis302dl_spi_remove(struct spi_device *spi)
{ {
struct lis3lv02d *lis3 = spi_get_drvdata(spi); struct lis3lv02d *lis3 = spi_get_drvdata(spi);
lis3lv02d_joystick_disable(lis3); lis3lv02d_joystick_disable(lis3);
......
...@@ -882,7 +882,7 @@ static int mei_probe(struct pci_dev *pdev, ...@@ -882,7 +882,7 @@ static int mei_probe(struct pci_dev *pdev,
* mei_remove is called by the PCI subsystem to alert the driver * mei_remove is called by the PCI subsystem to alert the driver
* that it should release a PCI device. * that it should release a PCI device.
*/ */
static void __devexit mei_remove(struct pci_dev *pdev) static void mei_remove(struct pci_dev *pdev)
{ {
struct mei_device *dev; struct mei_device *dev;
......
...@@ -819,7 +819,7 @@ static int pch_phub_probe(struct pci_dev *pdev, ...@@ -819,7 +819,7 @@ static int pch_phub_probe(struct pci_dev *pdev,
return ret; return ret;
} }
static void __devexit pch_phub_remove(struct pci_dev *pdev) static void pch_phub_remove(struct pci_dev *pdev)
{ {
struct pch_phub_reg *chip = pci_get_drvdata(pdev); struct pch_phub_reg *chip = pci_get_drvdata(pdev);
......
...@@ -435,7 +435,7 @@ static int phantom_probe(struct pci_dev *pdev, ...@@ -435,7 +435,7 @@ static int phantom_probe(struct pci_dev *pdev,
return retval; return retval;
} }
static void __devexit phantom_remove(struct pci_dev *pdev) static void phantom_remove(struct pci_dev *pdev)
{ {
struct phantom_device *pht = pci_get_drvdata(pdev); struct phantom_device *pht = pci_get_drvdata(pdev);
unsigned int minor = MINOR(pht->cdev.dev); unsigned int minor = MINOR(pht->cdev.dev);
......
...@@ -879,7 +879,7 @@ static int pti_pci_probe(struct pci_dev *pdev, ...@@ -879,7 +879,7 @@ static int pti_pci_probe(struct pci_dev *pdev,
* PCI bus. * PCI bus.
* @pdev: variable containing pci info of PTI. * @pdev: variable containing pci info of PTI.
*/ */
static void __devexit pti_pci_remove(struct pci_dev *pdev) static void pti_pci_remove(struct pci_dev *pdev)
{ {
struct pti_dev *drv_data = pci_get_drvdata(pdev); struct pti_dev *drv_data = pci_get_drvdata(pdev);
......
...@@ -853,7 +853,7 @@ static int spear_pcie_gadget_probe(struct platform_device *pdev) ...@@ -853,7 +853,7 @@ static int spear_pcie_gadget_probe(struct platform_device *pdev)
return status; return status;
} }
static int __devexit spear_pcie_gadget_remove(struct platform_device *pdev) static int spear_pcie_gadget_remove(struct platform_device *pdev)
{ {
struct resource *res0, *res1; struct resource *res0, *res1;
static struct pcie_gadget_target *target; static struct pcie_gadget_target *target;
......
...@@ -67,7 +67,7 @@ static int dac7512_probe(struct spi_device *spi) ...@@ -67,7 +67,7 @@ static int dac7512_probe(struct spi_device *spi)
return sysfs_create_group(&spi->dev.kobj, &dac7512_attr_group); return sysfs_create_group(&spi->dev.kobj, &dac7512_attr_group);
} }
static int __devexit dac7512_remove(struct spi_device *spi) static int dac7512_remove(struct spi_device *spi)
{ {
sysfs_remove_group(&spi->dev.kobj, &dac7512_attr_group); sysfs_remove_group(&spi->dev.kobj, &dac7512_attr_group);
return 0; return 0;
......
...@@ -405,7 +405,7 @@ static int tsl2550_probe(struct i2c_client *client, ...@@ -405,7 +405,7 @@ static int tsl2550_probe(struct i2c_client *client,
return err; return err;
} }
static int __devexit tsl2550_remove(struct i2c_client *client) static int tsl2550_remove(struct i2c_client *client)
{ {
sysfs_remove_group(&client->dev.kobj, &tsl2550_attr_group); sysfs_remove_group(&client->dev.kobj, &tsl2550_attr_group);
......
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