Skip to content

Commit

Permalink
misc: remove use of __devexit
Browse files Browse the repository at this point in the history
CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.

Signed-off-by: Bill 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
wfp5p authored and gregkh committed Nov 21, 2012
1 parent b328bfe commit 486a5c2
Show file tree
Hide file tree
Showing 24 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion drivers/misc/ad525x_dpot-i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/ad525x_dpot-spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ static int ad_dpot_spi_probe(struct spi_device *spi)
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);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/apds9802als.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ static int apds9802als_probe(struct i2c_client *client,
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/apds990x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1181,7 +1181,7 @@ static int apds990x_probe(struct i2c_client *client,
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/atmel-ssc.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ static int __init ssc_probe(struct platform_device *pdev)
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/bh1770glc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,7 @@ static int bh1770_probe(struct i2c_client *client,
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/bh1780gli.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ static int bh1780_probe(struct i2c_client *client,
return ret;
}

static int __devexit bh1780_remove(struct i2c_client *client)
static int bh1780_remove(struct i2c_client *client)
{
struct bh1780_data *ddata;

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/cb710/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ static int cb710_probe(struct pci_dev *pdev,
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);
unsigned long flags;
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/eeprom/at24.c
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
return err;
}

static int __devexit at24_remove(struct i2c_client *client)
static int at24_remove(struct i2c_client *client)
{
struct at24_data *at24;
int i;
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/eeprom/at25.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ static int at25_probe(struct spi_device *spi)
return err;
}

static int __devexit at25_remove(struct spi_device *spi)
static int at25_remove(struct spi_device *spi)
{
struct at25_data *at25;

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/eeprom/eeprom_93xx46.c
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ static int eeprom_93xx46_probe(struct spi_device *spi)
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/fsa9480.c
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ static int fsa9480_probe(struct i2c_client *client,
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);
if (client->irq)
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/ibmasm/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static int ibmasm_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/ioc4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
static void __devexit
static void
ioc4_remove(struct pci_dev *pdev)
{
struct ioc4_submodule *is;
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/isl29003.c
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ static int isl29003_probe(struct i2c_client *client,
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);
isl29003_set_power_state(client, 0);
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/lis3lv02d/lis3lv02d_i2c.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ static int lis3lv02d_i2c_probe(struct i2c_client *client,
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_platform_data *pdata = client->dev.platform_data;
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/lis3lv02d/lis3lv02d_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static int lis302dl_spi_probe(struct spi_device *spi)
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);
lis3lv02d_joystick_disable(lis3);
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/mei/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,7 @@ static int mei_probe(struct pci_dev *pdev,
* mei_remove is called by the PCI subsystem to alert the driver
* 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;

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/pch_phub.c
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ static int pch_phub_probe(struct pci_dev *pdev,
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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/phantom.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ static int phantom_probe(struct pci_dev *pdev,
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);
unsigned int minor = MINOR(pht->cdev.dev);
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/pti.c
Original file line number Diff line number Diff line change
Expand Up @@ -879,7 +879,7 @@ static int pti_pci_probe(struct pci_dev *pdev,
* PCI bus.
* @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);

Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/spear13xx_pcie_gadget.c
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ static int spear_pcie_gadget_probe(struct platform_device *pdev)
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;
static struct pcie_gadget_target *target;
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/ti_dac7512.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static int dac7512_probe(struct spi_device *spi)
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);
return 0;
Expand Down
2 changes: 1 addition & 1 deletion drivers/misc/tsl2550.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ static int tsl2550_probe(struct i2c_client *client,
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);

Expand Down

0 comments on commit 486a5c2

Please sign in to comment.