Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Bill Pemberton and committed by
Greg Kroah-Hartman
2d6bed9c 989623c7

+25 -25
+1 -1
drivers/misc/ad525x_dpot-i2c.c
··· 109 109 .owner = THIS_MODULE, 110 110 }, 111 111 .probe = ad_dpot_i2c_probe, 112 - .remove = __devexit_p(ad_dpot_i2c_remove), 112 + .remove = ad_dpot_i2c_remove, 113 113 .id_table = ad_dpot_id, 114 114 }; 115 115
+1 -1
drivers/misc/ad525x_dpot-spi.c
··· 131 131 .owner = THIS_MODULE, 132 132 }, 133 133 .probe = ad_dpot_spi_probe, 134 - .remove = __devexit_p(ad_dpot_spi_remove), 134 + .remove = ad_dpot_spi_remove, 135 135 .id_table = ad_dpot_spi_id, 136 136 }; 137 137
+1 -1
drivers/misc/apds9802als.c
··· 326 326 .pm = APDS9802ALS_PM_OPS, 327 327 }, 328 328 .probe = apds9802als_probe, 329 - .remove = __devexit_p(apds9802als_remove), 329 + .remove = apds9802als_remove, 330 330 .suspend = apds9802als_suspend, 331 331 .resume = apds9802als_resume, 332 332 .id_table = apds9802als_id,
+1 -1
drivers/misc/apds990x.c
··· 1275 1275 .pm = &apds990x_pm_ops, 1276 1276 }, 1277 1277 .probe = apds990x_probe, 1278 - .remove = __devexit_p(apds990x_remove), 1278 + .remove = apds990x_remove, 1279 1279 .id_table = apds990x_id, 1280 1280 }; 1281 1281
+1 -1
drivers/misc/atmel-ssc.c
··· 152 152 } 153 153 154 154 static struct platform_driver ssc_driver = { 155 - .remove = __devexit_p(ssc_remove), 155 + .remove = ssc_remove, 156 156 .driver = { 157 157 .name = "ssc", 158 158 .owner = THIS_MODULE,
+1 -1
drivers/misc/bh1770glc.c
··· 1395 1395 .pm = &bh1770_pm_ops, 1396 1396 }, 1397 1397 .probe = bh1770_probe, 1398 - .remove = __devexit_p(bh1770_remove), 1398 + .remove = bh1770_remove, 1399 1399 .id_table = bh1770_id, 1400 1400 }; 1401 1401
+1 -1
drivers/misc/bh1780gli.c
··· 248 248 249 249 static struct i2c_driver bh1780_driver = { 250 250 .probe = bh1780_probe, 251 - .remove = __devexit_p(bh1780_remove), 251 + .remove = bh1780_remove, 252 252 .id_table = bh1780_id, 253 253 .driver = { 254 254 .name = "bh1780",
+1 -1
drivers/misc/bmp085-i2c.c
··· 71 71 }, 72 72 .id_table = bmp085_id, 73 73 .probe = bmp085_i2c_probe, 74 - .remove = __devexit_p(bmp085_i2c_remove), 74 + .remove = bmp085_i2c_remove, 75 75 76 76 .detect = bmp085_i2c_detect, 77 77 .address_list = normal_i2c
+1 -1
drivers/misc/bmp085-spi.c
··· 70 70 }, 71 71 .id_table = bmp085_id, 72 72 .probe = bmp085_spi_probe, 73 - .remove = __devexit_p(bmp085_spi_remove) 73 + .remove = bmp085_spi_remove 74 74 }; 75 75 76 76 module_spi_driver(bmp085_spi_driver);
+1 -1
drivers/misc/cb710/core.c
··· 332 332 .name = KBUILD_MODNAME, 333 333 .id_table = cb710_pci_tbl, 334 334 .probe = cb710_probe, 335 - .remove = __devexit_p(cb710_remove_one), 335 + .remove = cb710_remove_one, 336 336 #ifdef CONFIG_PM 337 337 .suspend = cb710_suspend, 338 338 .resume = cb710_resume,
+1 -1
drivers/misc/eeprom/at24.c
··· 680 680 .owner = THIS_MODULE, 681 681 }, 682 682 .probe = at24_probe, 683 - .remove = __devexit_p(at24_remove), 683 + .remove = at24_remove, 684 684 .id_table = at24_ids, 685 685 }; 686 686
+1 -1
drivers/misc/eeprom/at25.c
··· 477 477 .owner = THIS_MODULE, 478 478 }, 479 479 .probe = at25_probe, 480 - .remove = __devexit_p(at25_remove), 480 + .remove = at25_remove, 481 481 }; 482 482 483 483 module_spi_driver(at25_driver);
+1 -1
drivers/misc/eeprom/eeprom_93xx46.c
··· 389 389 .owner = THIS_MODULE, 390 390 }, 391 391 .probe = eeprom_93xx46_probe, 392 - .remove = __devexit_p(eeprom_93xx46_remove), 392 + .remove = eeprom_93xx46_remove, 393 393 }; 394 394 395 395 module_spi_driver(eeprom_93xx46_driver);
+1 -1
drivers/misc/fsa9480.c
··· 533 533 .name = "fsa9480", 534 534 }, 535 535 .probe = fsa9480_probe, 536 - .remove = __devexit_p(fsa9480_remove), 536 + .remove = fsa9480_remove, 537 537 .resume = fsa9480_resume, 538 538 .suspend = fsa9480_suspend, 539 539 .id_table = fsa9480_id,
+1 -1
drivers/misc/hpilo.c
··· 859 859 .name = ILO_NAME, 860 860 .id_table = ilo_devices, 861 861 .probe = ilo_probe, 862 - .remove = __devexit_p(ilo_remove), 862 + .remove = ilo_remove, 863 863 }; 864 864 865 865 static int __init ilo_init(void)
+1 -1
drivers/misc/ibmasm/module.c
··· 198 198 .name = DRIVER_NAME, 199 199 .id_table = ibmasm_pci_table, 200 200 .probe = ibmasm_init_one, 201 - .remove = __devexit_p(ibmasm_remove_one), 201 + .remove = ibmasm_remove_one, 202 202 }; 203 203 204 204 static void __exit ibmasm_exit (void)
+1 -1
drivers/misc/ioc4.c
··· 466 466 .name = "IOC4", 467 467 .id_table = ioc4_id_table, 468 468 .probe = ioc4_probe, 469 - .remove = __devexit_p(ioc4_remove), 469 + .remove = ioc4_remove, 470 470 }; 471 471 472 472 MODULE_DEVICE_TABLE(pci, ioc4_id_table);
+1 -1
drivers/misc/isl29003.c
··· 451 451 .suspend = isl29003_suspend, 452 452 .resume = isl29003_resume, 453 453 .probe = isl29003_probe, 454 - .remove = __devexit_p(isl29003_remove), 454 + .remove = isl29003_remove, 455 455 .id_table = isl29003_id, 456 456 }; 457 457
+1 -1
drivers/misc/lis3lv02d/lis3lv02d_i2c.c
··· 280 280 .of_match_table = of_match_ptr(lis3lv02d_i2c_dt_ids), 281 281 }, 282 282 .probe = lis3lv02d_i2c_probe, 283 - .remove = __devexit_p(lis3lv02d_i2c_remove), 283 + .remove = lis3lv02d_i2c_remove, 284 284 .id_table = lis3lv02d_id, 285 285 }; 286 286
+1 -1
drivers/misc/lis3lv02d/lis3lv02d_spi.c
··· 144 144 .of_match_table = of_match_ptr(lis302dl_spi_dt_ids), 145 145 }, 146 146 .probe = lis302dl_spi_probe, 147 - .remove = __devexit_p(lis302dl_spi_remove), 147 + .remove = lis302dl_spi_remove, 148 148 }; 149 149 150 150 module_spi_driver(lis302dl_spi_driver);
+1 -1
drivers/misc/pch_phub.c
··· 888 888 .name = "pch_phub", 889 889 .id_table = pch_phub_pcidev_id, 890 890 .probe = pch_phub_probe, 891 - .remove = __devexit_p(pch_phub_remove), 891 + .remove = pch_phub_remove, 892 892 .suspend = pch_phub_suspend, 893 893 .resume = pch_phub_resume 894 894 };
+1 -1
drivers/misc/phantom.c
··· 499 499 .name = "phantom", 500 500 .id_table = phantom_pci_tbl, 501 501 .probe = phantom_probe, 502 - .remove = __devexit_p(phantom_remove), 502 + .remove = phantom_remove, 503 503 .suspend = phantom_suspend, 504 504 .resume = phantom_resume 505 505 };
+1 -1
drivers/misc/pti.c
··· 901 901 .name = PCINAME, 902 902 .id_table = pci_ids, 903 903 .probe = pti_pci_probe, 904 - .remove = __devexit_p(pti_pci_remove), 904 + .remove = pti_pci_remove, 905 905 }; 906 906 907 907 /**
+1 -1
drivers/misc/ti_dac7512.c
··· 79 79 .owner = THIS_MODULE, 80 80 }, 81 81 .probe = dac7512_probe, 82 - .remove = __devexit_p(dac7512_remove), 82 + .remove = dac7512_remove, 83 83 }; 84 84 85 85 module_spi_driver(dac7512_driver);
+1 -1
drivers/misc/tsl2550.c
··· 450 450 .suspend = tsl2550_suspend, 451 451 .resume = tsl2550_resume, 452 452 .probe = tsl2550_probe, 453 - .remove = __devexit_p(tsl2550_remove), 453 + .remove = tsl2550_remove, 454 454 .id_table = tsl2550_id, 455 455 }; 456 456