drivers/misc: remove use of __devexit_p

CONFIG_HOTPLUG is going away as an option so __devexit_p 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>

25 files changed, 25 insertions, 25 deletions

diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c
index 820826270b6..7254a98a89f 100644
--- a/drivers/misc/ad525x_dpot-i2c.c
+++ b/drivers/misc/ad525x_dpot-i2c.c
@@ -109,7 +109,7 @@ static struct i2c_driver ad_dpot_i2c_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad_dpot_i2c_probe,
-        .remove         = __devexit_p(ad_dpot_i2c_remove),
+        .remove         = ad_dpot_i2c_remove,
         .id_table       = ad_dpot_id,
 };
 
diff --git a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c
index f62317540d0..67e3073c2a6 100644
--- a/drivers/misc/ad525x_dpot-spi.c
+++ b/drivers/misc/ad525x_dpot-spi.c
@@ -131,7 +131,7 @@ static struct spi_driver ad_dpot_spi_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = ad_dpot_spi_probe,
-        .remove         = __devexit_p(ad_dpot_spi_remove),
+        .remove         = ad_dpot_spi_remove,
         .id_table       = ad_dpot_spi_id,
 };
 
diff --git a/drivers/misc/apds9802als.c b/drivers/misc/apds9802als.c
index 94923d25991..0132d15a995 100644
--- a/drivers/misc/apds9802als.c
+++ b/drivers/misc/apds9802als.c
@@ -326,7 +326,7 @@ static struct i2c_driver apds9802als_driver = {
                 .pm = APDS9802ALS_PM_OPS,
         },
         .probe = apds9802als_probe,
-        .remove = __devexit_p(apds9802als_remove),
+        .remove = apds9802als_remove,
         .suspend = apds9802als_suspend,
         .resume = apds9802als_resume,
         .id_table = apds9802als_id,
diff --git a/drivers/misc/apds990x.c b/drivers/misc/apds990x.c
index ee74244aa03..f955d546f2d 100644
--- a/drivers/misc/apds990x.c
+++ b/drivers/misc/apds990x.c
@@ -1275,7 +1275,7 @@ static struct i2c_driver apds990x_driver = {
                 .pm     = &apds990x_pm_ops,
         },
         .probe    = apds990x_probe,
-        .remove   = __devexit_p(apds990x_remove),
+        .remove   = apds990x_remove,
         .id_table = apds990x_id,
 };
 
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index 5bb18778107..191c2ce9d5e 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -152,7 +152,7 @@ static int __devexit ssc_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver ssc_driver = {
-        .remove         = __devexit_p(ssc_remove),
+        .remove         = ssc_remove,
         .driver         = {
                 .name           = "ssc",
                 .owner          = THIS_MODULE,
diff --git a/drivers/misc/bh1770glc.c b/drivers/misc/bh1770glc.c
index 3d56ae7ef8d..c4b65e26a76 100644
--- a/drivers/misc/bh1770glc.c
+++ b/drivers/misc/bh1770glc.c
@@ -1395,7 +1395,7 @@ static struct i2c_driver bh1770_driver = {
                 .pm     = &bh1770_pm_ops,
         },
         .probe    = bh1770_probe,
-        .remove   = __devexit_p(bh1770_remove),
+        .remove   = bh1770_remove,
         .id_table = bh1770_id,
 };
 
diff --git a/drivers/misc/bh1780gli.c b/drivers/misc/bh1780gli.c
index f1f9877f3fd..54f6f39f990 100644
--- a/drivers/misc/bh1780gli.c
+++ b/drivers/misc/bh1780gli.c
@@ -248,7 +248,7 @@ static const struct i2c_device_id bh1780_id[] = {
 
 static struct i2c_driver bh1780_driver = {
         .probe          = bh1780_probe,
-        .remove         = __devexit_p(bh1780_remove),
+        .remove         = bh1780_remove,
         .id_table       = bh1780_id,
         .driver = {
                 .name = "bh1780",
diff --git a/drivers/misc/bmp085-i2c.c b/drivers/misc/bmp085-i2c.c
index a4f33c995ea..08cd7958c14 100644
--- a/drivers/misc/bmp085-i2c.c
+++ b/drivers/misc/bmp085-i2c.c
@@ -71,7 +71,7 @@ static struct i2c_driver bmp085_i2c_driver = {
         },
         .id_table       = bmp085_id,
         .probe          = bmp085_i2c_probe,
-        .remove         = __devexit_p(bmp085_i2c_remove),
+        .remove         = bmp085_i2c_remove,
 
         .detect         = bmp085_i2c_detect,
         .address_list   = normal_i2c
diff --git a/drivers/misc/bmp085-spi.c b/drivers/misc/bmp085-spi.c
index 5e982af9973..ed34885a6b3 100644
--- a/drivers/misc/bmp085-spi.c
+++ b/drivers/misc/bmp085-spi.c
@@ -70,7 +70,7 @@ static struct spi_driver bmp085_spi_driver = {
         },
         .id_table       = bmp085_id,
         .probe          = bmp085_spi_probe,
-        .remove         = __devexit_p(bmp085_spi_remove)
+        .remove         = bmp085_spi_remove
 };
 
 module_spi_driver(bmp085_spi_driver);
diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c
index 9d5eed75466..489c468cf96 100644
--- a/drivers/misc/cb710/core.c
+++ b/drivers/misc/cb710/core.c
@@ -332,7 +332,7 @@ static struct pci_driver cb710_driver = {
         .name = KBUILD_MODNAME,
         .id_table = cb710_pci_tbl,
         .probe = cb710_probe,
-        .remove = __devexit_p(cb710_remove_one),
+        .remove = cb710_remove_one,
 #ifdef CONFIG_PM
         .suspend = cb710_suspend,
         .resume = cb710_resume,
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index ab1ad41786d..3c36997bdac 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -680,7 +680,7 @@ static struct i2c_driver at24_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = at24_probe,
-        .remove = __devexit_p(at24_remove),
+        .remove = at24_remove,
         .id_table = at24_ids,
 };
 
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
index 4ed93dd5411..fcb237e9bb1 100644
--- a/drivers/misc/eeprom/at25.c
+++ b/drivers/misc/eeprom/at25.c
@@ -477,7 +477,7 @@ static struct spi_driver at25_driver = {
                 .owner          = THIS_MODULE,
         },
         .probe          = at25_probe,
-        .remove         = __devexit_p(at25_remove),
+        .remove         = at25_remove,
 };
 
 module_spi_driver(at25_driver);
diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c
index ce3fe3633dd..3dc14eafc5c 100644
--- a/drivers/misc/eeprom/eeprom_93xx46.c
+++ b/drivers/misc/eeprom/eeprom_93xx46.c
@@ -389,7 +389,7 @@ static struct spi_driver eeprom_93xx46_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe          = eeprom_93xx46_probe,
-        .remove         = __devexit_p(eeprom_93xx46_remove),
+        .remove         = eeprom_93xx46_remove,
 };
 
 module_spi_driver(eeprom_93xx46_driver);
diff --git a/drivers/misc/fsa9480.c b/drivers/misc/fsa9480.c
index ac96c3a4034..38b52b90167 100644
--- a/drivers/misc/fsa9480.c
+++ b/drivers/misc/fsa9480.c
@@ -533,7 +533,7 @@ static struct i2c_driver fsa9480_i2c_driver = {
                 .name = "fsa9480",
         },
         .probe = fsa9480_probe,
-        .remove = __devexit_p(fsa9480_remove),
+        .remove = fsa9480_remove,
         .resume = fsa9480_resume,
         .suspend = fsa9480_suspend,
         .id_table = fsa9480_id,
diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index b362d938e92..47a9ce6b16f 100644
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -859,7 +859,7 @@ static struct pci_driver ilo_driver = {
         .name     = ILO_NAME,
         .id_table = ilo_devices,
         .probe    = ilo_probe,
-        .remove   = __devexit_p(ilo_remove),
+        .remove   = ilo_remove,
 };
 
 static int __init ilo_init(void)
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index 168d8008f46..f34a92fd679 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -198,7 +198,7 @@ static struct pci_driver ibmasm_driver = {
         .name           = DRIVER_NAME,
         .id_table       = ibmasm_pci_table,
         .probe          = ibmasm_init_one,
-        .remove         = __devexit_p(ibmasm_remove_one),
+        .remove         = ibmasm_remove_one,
 };
 
 static void __exit ibmasm_exit (void)
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c
index 6a7710603a9..794a7e002c8 100644
--- a/drivers/misc/ioc4.c
+++ b/drivers/misc/ioc4.c
@@ -466,7 +466,7 @@ static struct pci_driver ioc4_driver = {
         .name = "IOC4",
         .id_table = ioc4_id_table,
         .probe = ioc4_probe,
-        .remove = __devexit_p(ioc4_remove),
+        .remove = ioc4_remove,
 };
 
 MODULE_DEVICE_TABLE(pci, ioc4_id_table);
diff --git a/drivers/misc/isl29003.c b/drivers/misc/isl29003.c
index eb5de2e210d..bef5307296f 100644
--- a/drivers/misc/isl29003.c
+++ b/drivers/misc/isl29003.c
@@ -451,7 +451,7 @@ static struct i2c_driver isl29003_driver = {
         .suspend = isl29003_suspend,
         .resume = isl29003_resume,
         .probe  = isl29003_probe,
-        .remove = __devexit_p(isl29003_remove),
+        .remove = isl29003_remove,
         .id_table = isl29003_id,
 };
 
diff --git a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
index 60ec8689d6e..403804c8612 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_i2c.c
@@ -280,7 +280,7 @@ static struct i2c_driver lis3lv02d_i2c_driver = {
                 .of_match_table = of_match_ptr(lis3lv02d_i2c_dt_ids),
         },
         .probe  = lis3lv02d_i2c_probe,
-        .remove = __devexit_p(lis3lv02d_i2c_remove),
+        .remove = lis3lv02d_i2c_remove,
         .id_table = lis3lv02d_id,
 };
 
diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
index ccb6475fa05..0e415c31e03 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
@@ -144,7 +144,7 @@ static struct spi_driver lis302dl_spi_driver = {
                 .of_match_table = of_match_ptr(lis302dl_spi_dt_ids),
         },
         .probe  = lis302dl_spi_probe,
-        .remove = __devexit_p(lis302dl_spi_remove),
+        .remove = lis302dl_spi_remove,
 };
 
 module_spi_driver(lis302dl_spi_driver);
diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c
index c9f20dae185..5581774393c 100644
--- a/drivers/misc/pch_phub.c
+++ b/drivers/misc/pch_phub.c
@@ -888,7 +888,7 @@ static struct pci_driver pch_phub_driver = {
         .name = "pch_phub",
         .id_table = pch_phub_pcidev_id,
         .probe = pch_phub_probe,
-        .remove = __devexit_p(pch_phub_remove),
+        .remove = pch_phub_remove,
         .suspend = pch_phub_suspend,
         .resume = pch_phub_resume
 };
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index 21b28fc6d91..79038e9ced0 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -499,7 +499,7 @@ static struct pci_driver phantom_pci_driver = {
         .name = "phantom",
         .id_table = phantom_pci_tbl,
         .probe = phantom_probe,
-        .remove = __devexit_p(phantom_remove),
+        .remove = phantom_remove,
         .suspend = phantom_suspend,
         .resume = phantom_resume
 };
diff --git a/drivers/misc/pti.c b/drivers/misc/pti.c
index 4999b34b7a6..3c5d74638ea 100644
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@ -901,7 +901,7 @@ static struct pci_driver pti_pci_driver = {
         .name           = PCINAME,
         .id_table       = pci_ids,
         .probe          = pti_pci_probe,
-        .remove         = __devexit_p(pti_pci_remove),
+        .remove         = pti_pci_remove,
 };
 
 /**
diff --git a/drivers/misc/ti_dac7512.c b/drivers/misc/ti_dac7512.c
index 5acbba120de..85989ca7ad2 100644
--- a/drivers/misc/ti_dac7512.c
+++ b/drivers/misc/ti_dac7512.c
@@ -79,7 +79,7 @@ static struct spi_driver dac7512_driver = {
                 .owner  = THIS_MODULE,
         },
         .probe  = dac7512_probe,
-        .remove = __devexit_p(dac7512_remove),
+        .remove = dac7512_remove,
 };
 
 module_spi_driver(dac7512_driver);
diff --git a/drivers/misc/tsl2550.c b/drivers/misc/tsl2550.c
index 0beb298a17d..09ffb0b705f 100644
--- a/drivers/misc/tsl2550.c
+++ b/drivers/misc/tsl2550.c
@@ -450,7 +450,7 @@ static struct i2c_driver tsl2550_driver = {
         .suspend = tsl2550_suspend,
         .resume = tsl2550_resume,
         .probe  = tsl2550_probe,
-        .remove = __devexit_p(tsl2550_remove),
+        .remove = tsl2550_remove,
         .id_table = tsl2550_id,
 };