Commit 2d6bed9c authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

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: 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 989623c7
...@@ -109,7 +109,7 @@ static struct i2c_driver ad_dpot_i2c_driver = { ...@@ -109,7 +109,7 @@ static struct i2c_driver ad_dpot_i2c_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ad_dpot_i2c_probe, .probe = ad_dpot_i2c_probe,
.remove = __devexit_p(ad_dpot_i2c_remove), .remove = ad_dpot_i2c_remove,
.id_table = ad_dpot_id, .id_table = ad_dpot_id,
}; };
......
...@@ -131,7 +131,7 @@ static struct spi_driver ad_dpot_spi_driver = { ...@@ -131,7 +131,7 @@ static struct spi_driver ad_dpot_spi_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = ad_dpot_spi_probe, .probe = ad_dpot_spi_probe,
.remove = __devexit_p(ad_dpot_spi_remove), .remove = ad_dpot_spi_remove,
.id_table = ad_dpot_spi_id, .id_table = ad_dpot_spi_id,
}; };
......
...@@ -326,7 +326,7 @@ static struct i2c_driver apds9802als_driver = { ...@@ -326,7 +326,7 @@ static struct i2c_driver apds9802als_driver = {
.pm = APDS9802ALS_PM_OPS, .pm = APDS9802ALS_PM_OPS,
}, },
.probe = apds9802als_probe, .probe = apds9802als_probe,
.remove = __devexit_p(apds9802als_remove), .remove = apds9802als_remove,
.suspend = apds9802als_suspend, .suspend = apds9802als_suspend,
.resume = apds9802als_resume, .resume = apds9802als_resume,
.id_table = apds9802als_id, .id_table = apds9802als_id,
......
...@@ -1275,7 +1275,7 @@ static struct i2c_driver apds990x_driver = { ...@@ -1275,7 +1275,7 @@ static struct i2c_driver apds990x_driver = {
.pm = &apds990x_pm_ops, .pm = &apds990x_pm_ops,
}, },
.probe = apds990x_probe, .probe = apds990x_probe,
.remove = __devexit_p(apds990x_remove), .remove = apds990x_remove,
.id_table = apds990x_id, .id_table = apds990x_id,
}; };
......
...@@ -152,7 +152,7 @@ static int __devexit ssc_remove(struct platform_device *pdev) ...@@ -152,7 +152,7 @@ static int __devexit ssc_remove(struct platform_device *pdev)
} }
static struct platform_driver ssc_driver = { static struct platform_driver ssc_driver = {
.remove = __devexit_p(ssc_remove), .remove = ssc_remove,
.driver = { .driver = {
.name = "ssc", .name = "ssc",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
...@@ -1395,7 +1395,7 @@ static struct i2c_driver bh1770_driver = { ...@@ -1395,7 +1395,7 @@ static struct i2c_driver bh1770_driver = {
.pm = &bh1770_pm_ops, .pm = &bh1770_pm_ops,
}, },
.probe = bh1770_probe, .probe = bh1770_probe,
.remove = __devexit_p(bh1770_remove), .remove = bh1770_remove,
.id_table = bh1770_id, .id_table = bh1770_id,
}; };
......
...@@ -248,7 +248,7 @@ static const struct i2c_device_id bh1780_id[] = { ...@@ -248,7 +248,7 @@ static const struct i2c_device_id bh1780_id[] = {
static struct i2c_driver bh1780_driver = { static struct i2c_driver bh1780_driver = {
.probe = bh1780_probe, .probe = bh1780_probe,
.remove = __devexit_p(bh1780_remove), .remove = bh1780_remove,
.id_table = bh1780_id, .id_table = bh1780_id,
.driver = { .driver = {
.name = "bh1780", .name = "bh1780",
......
...@@ -71,7 +71,7 @@ static struct i2c_driver bmp085_i2c_driver = { ...@@ -71,7 +71,7 @@ static struct i2c_driver bmp085_i2c_driver = {
}, },
.id_table = bmp085_id, .id_table = bmp085_id,
.probe = bmp085_i2c_probe, .probe = bmp085_i2c_probe,
.remove = __devexit_p(bmp085_i2c_remove), .remove = bmp085_i2c_remove,
.detect = bmp085_i2c_detect, .detect = bmp085_i2c_detect,
.address_list = normal_i2c .address_list = normal_i2c
......
...@@ -70,7 +70,7 @@ static struct spi_driver bmp085_spi_driver = { ...@@ -70,7 +70,7 @@ static struct spi_driver bmp085_spi_driver = {
}, },
.id_table = bmp085_id, .id_table = bmp085_id,
.probe = bmp085_spi_probe, .probe = bmp085_spi_probe,
.remove = __devexit_p(bmp085_spi_remove) .remove = bmp085_spi_remove
}; };
module_spi_driver(bmp085_spi_driver); module_spi_driver(bmp085_spi_driver);
......
...@@ -332,7 +332,7 @@ static struct pci_driver cb710_driver = { ...@@ -332,7 +332,7 @@ static struct pci_driver cb710_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = cb710_pci_tbl, .id_table = cb710_pci_tbl,
.probe = cb710_probe, .probe = cb710_probe,
.remove = __devexit_p(cb710_remove_one), .remove = cb710_remove_one,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = cb710_suspend, .suspend = cb710_suspend,
.resume = cb710_resume, .resume = cb710_resume,
......
...@@ -680,7 +680,7 @@ static struct i2c_driver at24_driver = { ...@@ -680,7 +680,7 @@ static struct i2c_driver at24_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = at24_probe, .probe = at24_probe,
.remove = __devexit_p(at24_remove), .remove = at24_remove,
.id_table = at24_ids, .id_table = at24_ids,
}; };
......
...@@ -477,7 +477,7 @@ static struct spi_driver at25_driver = { ...@@ -477,7 +477,7 @@ static struct spi_driver at25_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = at25_probe, .probe = at25_probe,
.remove = __devexit_p(at25_remove), .remove = at25_remove,
}; };
module_spi_driver(at25_driver); module_spi_driver(at25_driver);
......
...@@ -389,7 +389,7 @@ static struct spi_driver eeprom_93xx46_driver = { ...@@ -389,7 +389,7 @@ static struct spi_driver eeprom_93xx46_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = eeprom_93xx46_probe, .probe = eeprom_93xx46_probe,
.remove = __devexit_p(eeprom_93xx46_remove), .remove = eeprom_93xx46_remove,
}; };
module_spi_driver(eeprom_93xx46_driver); module_spi_driver(eeprom_93xx46_driver);
......
...@@ -533,7 +533,7 @@ static struct i2c_driver fsa9480_i2c_driver = { ...@@ -533,7 +533,7 @@ static struct i2c_driver fsa9480_i2c_driver = {
.name = "fsa9480", .name = "fsa9480",
}, },
.probe = fsa9480_probe, .probe = fsa9480_probe,
.remove = __devexit_p(fsa9480_remove), .remove = fsa9480_remove,
.resume = fsa9480_resume, .resume = fsa9480_resume,
.suspend = fsa9480_suspend, .suspend = fsa9480_suspend,
.id_table = fsa9480_id, .id_table = fsa9480_id,
......
...@@ -859,7 +859,7 @@ static struct pci_driver ilo_driver = { ...@@ -859,7 +859,7 @@ static struct pci_driver ilo_driver = {
.name = ILO_NAME, .name = ILO_NAME,
.id_table = ilo_devices, .id_table = ilo_devices,
.probe = ilo_probe, .probe = ilo_probe,
.remove = __devexit_p(ilo_remove), .remove = ilo_remove,
}; };
static int __init ilo_init(void) static int __init ilo_init(void)
......
...@@ -198,7 +198,7 @@ static struct pci_driver ibmasm_driver = { ...@@ -198,7 +198,7 @@ static struct pci_driver ibmasm_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
.id_table = ibmasm_pci_table, .id_table = ibmasm_pci_table,
.probe = ibmasm_init_one, .probe = ibmasm_init_one,
.remove = __devexit_p(ibmasm_remove_one), .remove = ibmasm_remove_one,
}; };
static void __exit ibmasm_exit (void) static void __exit ibmasm_exit (void)
......
...@@ -466,7 +466,7 @@ static struct pci_driver ioc4_driver = { ...@@ -466,7 +466,7 @@ static struct pci_driver ioc4_driver = {
.name = "IOC4", .name = "IOC4",
.id_table = ioc4_id_table, .id_table = ioc4_id_table,
.probe = ioc4_probe, .probe = ioc4_probe,
.remove = __devexit_p(ioc4_remove), .remove = ioc4_remove,
}; };
MODULE_DEVICE_TABLE(pci, ioc4_id_table); MODULE_DEVICE_TABLE(pci, ioc4_id_table);
......
...@@ -451,7 +451,7 @@ static struct i2c_driver isl29003_driver = { ...@@ -451,7 +451,7 @@ static struct i2c_driver isl29003_driver = {
.suspend = isl29003_suspend, .suspend = isl29003_suspend,
.resume = isl29003_resume, .resume = isl29003_resume,
.probe = isl29003_probe, .probe = isl29003_probe,
.remove = __devexit_p(isl29003_remove), .remove = isl29003_remove,
.id_table = isl29003_id, .id_table = isl29003_id,
}; };
......
...@@ -280,7 +280,7 @@ static struct i2c_driver lis3lv02d_i2c_driver = { ...@@ -280,7 +280,7 @@ static struct i2c_driver lis3lv02d_i2c_driver = {
.of_match_table = of_match_ptr(lis3lv02d_i2c_dt_ids), .of_match_table = of_match_ptr(lis3lv02d_i2c_dt_ids),
}, },
.probe = lis3lv02d_i2c_probe, .probe = lis3lv02d_i2c_probe,
.remove = __devexit_p(lis3lv02d_i2c_remove), .remove = lis3lv02d_i2c_remove,
.id_table = lis3lv02d_id, .id_table = lis3lv02d_id,
}; };
......
...@@ -144,7 +144,7 @@ static struct spi_driver lis302dl_spi_driver = { ...@@ -144,7 +144,7 @@ static struct spi_driver lis302dl_spi_driver = {
.of_match_table = of_match_ptr(lis302dl_spi_dt_ids), .of_match_table = of_match_ptr(lis302dl_spi_dt_ids),
}, },
.probe = lis302dl_spi_probe, .probe = lis302dl_spi_probe,
.remove = __devexit_p(lis302dl_spi_remove), .remove = lis302dl_spi_remove,
}; };
module_spi_driver(lis302dl_spi_driver); module_spi_driver(lis302dl_spi_driver);
......
...@@ -888,7 +888,7 @@ static struct pci_driver pch_phub_driver = { ...@@ -888,7 +888,7 @@ static struct pci_driver pch_phub_driver = {
.name = "pch_phub", .name = "pch_phub",
.id_table = pch_phub_pcidev_id, .id_table = pch_phub_pcidev_id,
.probe = pch_phub_probe, .probe = pch_phub_probe,
.remove = __devexit_p(pch_phub_remove), .remove = pch_phub_remove,
.suspend = pch_phub_suspend, .suspend = pch_phub_suspend,
.resume = pch_phub_resume .resume = pch_phub_resume
}; };
......
...@@ -499,7 +499,7 @@ static struct pci_driver phantom_pci_driver = { ...@@ -499,7 +499,7 @@ static struct pci_driver phantom_pci_driver = {
.name = "phantom", .name = "phantom",
.id_table = phantom_pci_tbl, .id_table = phantom_pci_tbl,
.probe = phantom_probe, .probe = phantom_probe,
.remove = __devexit_p(phantom_remove), .remove = phantom_remove,
.suspend = phantom_suspend, .suspend = phantom_suspend,
.resume = phantom_resume .resume = phantom_resume
}; };
......
...@@ -901,7 +901,7 @@ static struct pci_driver pti_pci_driver = { ...@@ -901,7 +901,7 @@ static struct pci_driver pti_pci_driver = {
.name = PCINAME, .name = PCINAME,
.id_table = pci_ids, .id_table = pci_ids,
.probe = pti_pci_probe, .probe = pti_pci_probe,
.remove = __devexit_p(pti_pci_remove), .remove = pti_pci_remove,
}; };
/** /**
......
...@@ -79,7 +79,7 @@ static struct spi_driver dac7512_driver = { ...@@ -79,7 +79,7 @@ static struct spi_driver dac7512_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = dac7512_probe, .probe = dac7512_probe,
.remove = __devexit_p(dac7512_remove), .remove = dac7512_remove,
}; };
module_spi_driver(dac7512_driver); module_spi_driver(dac7512_driver);
......
...@@ -450,7 +450,7 @@ static struct i2c_driver tsl2550_driver = { ...@@ -450,7 +450,7 @@ static struct i2c_driver tsl2550_driver = {
.suspend = tsl2550_suspend, .suspend = tsl2550_suspend,
.resume = tsl2550_resume, .resume = tsl2550_resume,
.probe = tsl2550_probe, .probe = tsl2550_probe,
.remove = __devexit_p(tsl2550_remove), .remove = tsl2550_remove,
.id_table = tsl2550_id, .id_table = tsl2550_id,
}; };
......
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