misc: remove use of __devexit

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>

diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c
index c7bc84df4bdbfe445acccf8b01af1b745561aea7..705b881e186d536ccb2bc97c392d108b3ecf765c 100644 (file)
--- a/drivers/misc/ad525x_dpot-i2c.c
+++ b/drivers/misc/ad525x_dpot-i2c.c
@@ -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);
 }

diff --git a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c
index 240c59870e7dcfcc335f21f2483ff0ebfe049fb4..9da04ede04f356aaef1495bd0cf01408e6556da5 100644 (file)
--- a/drivers/misc/ad525x_dpot-spi.c
+++ b/drivers/misc/ad525x_dpot-spi.c
@@ -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);
 }

diff --git a/drivers/misc/apds9802als.c b/drivers/misc/apds9802als.c
index 0132d15a995cc1cb08918fd1ba4ce919f8828b58..d648b089302761596bb06a844b09e939bb065e87 100644 (file)
--- a/drivers/misc/apds9802als.c
+++ b/drivers/misc/apds9802als.c
@@ -254,7 +254,7 @@ als_error1:
        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);
 

diff --git a/drivers/misc/apds990x.c b/drivers/misc/apds990x.c
index b2aaf3f04459af21a860d076bf744e91a140835e..0e67f8263cd8bf421c939ae8870f5e4503af2961 100644 (file)
--- a/drivers/misc/apds990x.c
+++ b/drivers/misc/apds990x.c
@@ -1181,7 +1181,7 @@ fail1:
        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);
 

diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index 191c2ce9d5e11ebf4b59e0811bd02118773073e7..c58f9abcb35659f58ee9fbdbaad5c387d366ad06 100644 (file)
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -137,7 +137,7 @@ out:
        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);
 

diff --git a/drivers/misc/bh1770glc.c b/drivers/misc/bh1770glc.c
index 003e8d9ab8a52fc3d4cc9fd6c5980c391d20fd2a..2ed8fc3be7e66e5e6b4972560c223ba48542b337 100644 (file)
--- a/drivers/misc/bh1770glc.c
+++ b/drivers/misc/bh1770glc.c
@@ -1285,7 +1285,7 @@ fail1:
        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);
 

diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c
index 3004904d23d47bc9c4e7afa2612b988163aaf195..cf03d0abf33ef346f8b9d84143f6a07818e304c3 100644 (file)
--- a/drivers/misc/bh1780gli.c
+++ b/drivers/misc/bh1780gli.c
@@ -185,7 +185,7 @@ err_op_failed:
        return ret;
 }
 
-static int __devexit bh1780_remove(struct i2c_client *client)
+static int bh1780_remove(struct i2c_client *client)
 {
        struct bh1780_data *ddata;
 

diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c
index 4fc9c37cd20223e7273f8553a42afad5db7f3d4b..2e50f811ff599205aade6f1b877bc7877e3917bb 100644 (file)
--- a/drivers/misc/cb710/core.c
+++ b/drivers/misc/cb710/core.c
@@ -305,7 +305,7 @@ unreg_mmc:
        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;

diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 3c36997bdacd6c78e7b11a50e6fa385eea163f53..2baeec56edfe9432494d67814c9a57b4da9b916d 100644 (file)
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -656,7 +656,7 @@ err_out:
        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;

diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
index fcb237e9bb1afdd02842cc18a097b63a5303d8bc..b08cf8a087891c47f17995598ad205626d588bad 100644 (file)
--- a/drivers/misc/eeprom/at25.c
+++ b/drivers/misc/eeprom/at25.c
@@ -459,7 +459,7 @@ fail:
        return err;
 }
 
-static int __devexit at25_remove(struct spi_device *spi)
+static int at25_remove(struct spi_device *spi)
 {
        struct at25_data        *at25;
 

diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c
index 3dd9005fd0e54bf6a5a09571d0156aa5d609a651..a6b5d5e73485cc5a83ee6ae8c8d5257019dc3d2e 100644 (file)
--- a/drivers/misc/eeprom/eeprom_93xx46.c
+++ b/drivers/misc/eeprom/eeprom_93xx46.c
@@ -370,7 +370,7 @@ fail:
        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);
 

diff --git a/drivers/misc/fsa9480.c b/drivers/misc/fsa9480.c
index 2baa52f07c7ae3392f98d0a7c0698b7a21bdc267..e8cbb1c59f4c27456dd726d2bb4f32ef360867e4 100644 (file)
--- a/drivers/misc/fsa9480.c
+++ b/drivers/misc/fsa9480.c
@@ -462,7 +462,7 @@ fail1:
        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)

diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index 380e4298ada193be80b8a6feae2914ebe250adf3..0346d87c5fed9f20fffa622269b4102bbdeb516f 100644 (file)
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -163,7 +163,7 @@ error_resources:
        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);
 

diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c
index 3ef92dca547281327d8a7f87b20797af6419b126..06f6ad29ceff294a67cb34c10f88b2a1f1e6e78a 100644 (file)
--- a/drivers/misc/ioc4.c
+++ b/drivers/misc/ioc4.c
@@ -415,7 +415,7 @@ out:
 }
 
 /* Removes a particular instance of an IOC4 card. */
-static void __devexit
+static void
 ioc4_remove(struct pci_dev *pdev)
 {
        struct ioc4_submodule *is;

diff --git a/drivers/misc/isl29003.c b/drivers/misc/isl29003.c
index 9fd4c0c6e599b8d752ef48f6934f6b0533aa4c3b..29b306c6bdb3bbf3d5e4c2b225984d9572acdd10 100644 (file)
--- a/drivers/misc/isl29003.c
+++ b/drivers/misc/isl29003.c
@@ -401,7 +401,7 @@ exit_kfree:
        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);

diff --git a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
index 66f0483efb035cdf69bd109ac721258eb0177bdb..7c97550240f19db127c56b1eb1322f0fe8de803d 100644 (file)
--- a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
@@ -191,7 +191,7 @@ fail:
        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;

diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
index 66a751d2ed537d8a043956e97e29e883513732ad..9aa2bd2a71ae4fc268f4831d2c9622e890f48b54 100644 (file)
--- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
@@ -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);

diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 4782c582ae382bd4a009a7be0a20e69f4e6f1fb8..43fb52ff98ad261aa2578cce00db25720de810d8 100644 (file)
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -882,7 +882,7 @@ end:
  * 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;
 

diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c
index 3896cff2579fb067424c60635830d140f020daca..931e635aa4916f324c019d584482c7925e4ed4d6 100644 (file)
--- a/drivers/misc/pch_phub.c
+++ b/drivers/misc/pch_phub.c
@@ -819,7 +819,7 @@ err_pci_enable_dev:
        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);
 

diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index 035776342a4c907d177df4d0e111060b7d8f0665..68b7c773d2cf472e23395ec563a7ed3abfbb9c9c 100644 (file)
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -435,7 +435,7 @@ err:
        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);

diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index 37d4b5ef9dc76725a30e87fbb82b1dca4f79ef4d..7003031c9181b4a5a08d25bdba2f788b4a5f092d 100644 (file)
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@ -879,7 +879,7 @@ err:
  *                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);
 

diff --git a/drivers/misc/spear13xx_pcie_gadget.c b/drivers/misc/spear13xx_pcie_gadget.c
index 7850320462fb53f420ad3d3bcdbdce8378d7c86d..7deb25dc86a7b2fd101203af1bc5d5ccbd127046 100644 (file)
--- a/drivers/misc/spear13xx_pcie_gadget.c
+++ b/drivers/misc/spear13xx_pcie_gadget.c
@@ -853,7 +853,7 @@ err_rel_res0:
        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;

diff --git a/drivers/misc/ti_dac7512.c b/drivers/misc/ti_dac7512.c
index 1222f86dfda925625033767d936d357f7b8ad02e..1d86407189eb2ee9ac94a8b4464d96f9d7d21393 100644 (file)
--- a/drivers/misc/ti_dac7512.c
+++ b/drivers/misc/ti_dac7512.c
@@ -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;

diff --git a/drivers/misc/tsl2550.c b/drivers/misc/tsl2550.c
index 18bce70b30f20e0366d9f2dfb1f8854960edfc82..1e7bc0eb081ed441a13925e1c7f0a8a4967a2d79 100644 (file)
--- a/drivers/misc/tsl2550.c
+++ b/drivers/misc/tsl2550.c
@@ -405,7 +405,7 @@ exit:
        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);