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

staging: iio: 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: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Bill Pemberton and committed by
Greg Kroah-Hartman
e543acf0 447d4f29

+63 -63
+1 -1
drivers/staging/iio/accel/adis16201_core.c
··· 242 242 .owner = THIS_MODULE, 243 243 }, 244 244 .probe = adis16201_probe, 245 - .remove = __devexit_p(adis16201_remove), 245 + .remove = adis16201_remove, 246 246 }; 247 247 module_spi_driver(adis16201_driver); 248 248
+1 -1
drivers/staging/iio/accel/adis16203_core.c
··· 209 209 .owner = THIS_MODULE, 210 210 }, 211 211 .probe = adis16203_probe, 212 - .remove = __devexit_p(adis16203_remove), 212 + .remove = adis16203_remove, 213 213 }; 214 214 module_spi_driver(adis16203_driver); 215 215
+1 -1
drivers/staging/iio/accel/adis16204_core.c
··· 249 249 .owner = THIS_MODULE, 250 250 }, 251 251 .probe = adis16204_probe, 252 - .remove = __devexit_p(adis16204_remove), 252 + .remove = adis16204_remove, 253 253 }; 254 254 module_spi_driver(adis16204_driver); 255 255
+1 -1
drivers/staging/iio/accel/adis16209_core.c
··· 242 242 .owner = THIS_MODULE, 243 243 }, 244 244 .probe = adis16209_probe, 245 - .remove = __devexit_p(adis16209_remove), 245 + .remove = adis16209_remove, 246 246 }; 247 247 module_spi_driver(adis16209_driver); 248 248
+1 -1
drivers/staging/iio/accel/adis16220_core.c
··· 503 503 .owner = THIS_MODULE, 504 504 }, 505 505 .probe = adis16220_probe, 506 - .remove = __devexit_p(adis16220_remove), 506 + .remove = adis16220_remove, 507 507 }; 508 508 module_spi_driver(adis16220_driver); 509 509
+1 -1
drivers/staging/iio/accel/adis16240_core.c
··· 297 297 .owner = THIS_MODULE, 298 298 }, 299 299 .probe = adis16240_probe, 300 - .remove = __devexit_p(adis16240_remove), 300 + .remove = adis16240_remove, 301 301 }; 302 302 module_spi_driver(adis16240_driver); 303 303
+1 -1
drivers/staging/iio/accel/kxsd9.c
··· 281 281 .owner = THIS_MODULE, 282 282 }, 283 283 .probe = kxsd9_probe, 284 - .remove = __devexit_p(kxsd9_remove), 284 + .remove = kxsd9_remove, 285 285 .id_table = kxsd9_id, 286 286 }; 287 287 module_spi_driver(kxsd9_driver);
+1 -1
drivers/staging/iio/accel/lis3l02dq_core.c
··· 810 810 .owner = THIS_MODULE, 811 811 }, 812 812 .probe = lis3l02dq_probe, 813 - .remove = __devexit_p(lis3l02dq_remove), 813 + .remove = lis3l02dq_remove, 814 814 }; 815 815 module_spi_driver(lis3l02dq_driver); 816 816
+1 -1
drivers/staging/iio/accel/sca3000_core.c
··· 1265 1265 .owner = THIS_MODULE, 1266 1266 }, 1267 1267 .probe = sca3000_probe, 1268 - .remove = __devexit_p(sca3000_remove), 1268 + .remove = sca3000_remove, 1269 1269 .id_table = sca3000_id, 1270 1270 }; 1271 1271 module_spi_driver(sca3000_driver);
+1 -1
drivers/staging/iio/adc/ad7192.c
··· 716 716 .owner = THIS_MODULE, 717 717 }, 718 718 .probe = ad7192_probe, 719 - .remove = __devexit_p(ad7192_remove), 719 + .remove = ad7192_remove, 720 720 .id_table = ad7192_id, 721 721 }; 722 722 module_spi_driver(ad7192_driver);
+1 -1
drivers/staging/iio/adc/ad7280a.c
··· 981 981 .owner = THIS_MODULE, 982 982 }, 983 983 .probe = ad7280_probe, 984 - .remove = __devexit_p(ad7280_remove), 984 + .remove = ad7280_remove, 985 985 .id_table = ad7280_id, 986 986 }; 987 987 module_spi_driver(ad7280_driver);
+1 -1
drivers/staging/iio/adc/ad7291.c
··· 706 706 .name = KBUILD_MODNAME, 707 707 }, 708 708 .probe = ad7291_probe, 709 - .remove = __devexit_p(ad7291_remove), 709 + .remove = ad7291_remove, 710 710 .id_table = ad7291_id, 711 711 }; 712 712 module_i2c_driver(ad7291_driver);
+1 -1
drivers/staging/iio/adc/ad7606_par.c
··· 164 164 165 165 static struct platform_driver ad7606_driver = { 166 166 .probe = ad7606_par_probe, 167 - .remove = __devexit_p(ad7606_par_remove), 167 + .remove = ad7606_par_remove, 168 168 .id_table = ad7606_driver_ids, 169 169 .driver = { 170 170 .name = "ad7606",
+1 -1
drivers/staging/iio/adc/ad7606_spi.c
··· 106 106 .pm = AD7606_SPI_PM_OPS, 107 107 }, 108 108 .probe = ad7606_spi_probe, 109 - .remove = __devexit_p(ad7606_spi_remove), 109 + .remove = ad7606_spi_remove, 110 110 .id_table = ad7606_id, 111 111 }; 112 112 module_spi_driver(ad7606_driver);
+1 -1
drivers/staging/iio/adc/ad7780.c
··· 283 283 .owner = THIS_MODULE, 284 284 }, 285 285 .probe = ad7780_probe, 286 - .remove = __devexit_p(ad7780_remove), 286 + .remove = ad7780_remove, 287 287 .id_table = ad7780_id, 288 288 }; 289 289 module_spi_driver(ad7780_driver);
+1 -1
drivers/staging/iio/adc/ad7793.c
··· 556 556 .owner = THIS_MODULE, 557 557 }, 558 558 .probe = ad7793_probe, 559 - .remove = __devexit_p(ad7793_remove), 559 + .remove = ad7793_remove, 560 560 .id_table = ad7793_id, 561 561 }; 562 562 module_spi_driver(ad7793_driver);
+1 -1
drivers/staging/iio/adc/ad7816.c
··· 463 463 .owner = THIS_MODULE, 464 464 }, 465 465 .probe = ad7816_probe, 466 - .remove = __devexit_p(ad7816_remove), 466 + .remove = ad7816_remove, 467 467 .id_table = ad7816_id, 468 468 }; 469 469 module_spi_driver(ad7816_driver);
+1 -1
drivers/staging/iio/adc/ad799x_core.c
··· 970 970 .name = "ad799x", 971 971 }, 972 972 .probe = ad799x_probe, 973 - .remove = __devexit_p(ad799x_remove), 973 + .remove = ad799x_remove, 974 974 .id_table = ad799x_id, 975 975 }; 976 976 module_i2c_driver(ad799x_driver);
+2 -2
drivers/staging/iio/adc/adt7410.c
··· 900 900 .name = "adt7410", 901 901 }, 902 902 .probe = adt7410_i2c_probe, 903 - .remove = __devexit_p(adt7410_i2c_remove), 903 + .remove = adt7410_i2c_remove, 904 904 .id_table = adt7410_id, 905 905 }; 906 906 ··· 1053 1053 .owner = THIS_MODULE, 1054 1054 }, 1055 1055 .probe = adt7310_spi_probe, 1056 - .remove = __devexit_p(adt7310_spi_remove), 1056 + .remove = adt7310_spi_remove, 1057 1057 .id_table = adt7310_id, 1058 1058 }; 1059 1059
+1 -1
drivers/staging/iio/adc/lpc32xx_adc.c
··· 233 233 234 234 static struct platform_driver lpc32xx_adc_driver = { 235 235 .probe = lpc32xx_adc_probe, 236 - .remove = __devexit_p(lpc32xx_adc_remove), 236 + .remove = lpc32xx_adc_remove, 237 237 .driver = { 238 238 .name = MOD_NAME, 239 239 .owner = THIS_MODULE,
+1 -1
drivers/staging/iio/adc/mxs-lradc.c
··· 579 579 .of_match_table = mxs_lradc_dt_ids, 580 580 }, 581 581 .probe = mxs_lradc_probe, 582 - .remove = __devexit_p(mxs_lradc_remove), 582 + .remove = mxs_lradc_remove, 583 583 }; 584 584 585 585 module_platform_driver(mxs_lradc_driver);
+1 -1
drivers/staging/iio/adc/spear_adc.c
··· 424 424 425 425 static struct platform_driver spear_adc_driver = { 426 426 .probe = spear_adc_probe, 427 - .remove = __devexit_p(spear_adc_remove), 427 + .remove = spear_adc_remove, 428 428 .driver = { 429 429 .name = MOD_NAME, 430 430 .owner = THIS_MODULE,
+1 -1
drivers/staging/iio/addac/adt7316-i2c.c
··· 132 132 .owner = THIS_MODULE, 133 133 }, 134 134 .probe = adt7316_i2c_probe, 135 - .remove = __devexit_p(adt7316_i2c_remove), 135 + .remove = adt7316_i2c_remove, 136 136 .id_table = adt7316_i2c_id, 137 137 }; 138 138 module_i2c_driver(adt7316_driver);
+1 -1
drivers/staging/iio/addac/adt7316-spi.c
··· 140 140 .owner = THIS_MODULE, 141 141 }, 142 142 .probe = adt7316_spi_probe, 143 - .remove = __devexit_p(adt7316_spi_remove), 143 + .remove = adt7316_spi_remove, 144 144 .id_table = adt7316_spi_id, 145 145 }; 146 146 module_spi_driver(adt7316_driver);
+1 -1
drivers/staging/iio/cdc/ad7150.c
··· 658 658 .name = "ad7150", 659 659 }, 660 660 .probe = ad7150_probe, 661 - .remove = __devexit_p(ad7150_remove), 661 + .remove = ad7150_remove, 662 662 .id_table = ad7150_id, 663 663 }; 664 664 module_i2c_driver(ad7150_driver);
+1 -1
drivers/staging/iio/cdc/ad7152.c
··· 541 541 .name = KBUILD_MODNAME, 542 542 }, 543 543 .probe = ad7152_probe, 544 - .remove = __devexit_p(ad7152_remove), 544 + .remove = ad7152_remove, 545 545 .id_table = ad7152_id, 546 546 }; 547 547 module_i2c_driver(ad7152_driver);
+1 -1
drivers/staging/iio/cdc/ad7746.c
··· 792 792 .name = KBUILD_MODNAME, 793 793 }, 794 794 .probe = ad7746_probe, 795 - .remove = __devexit_p(ad7746_remove), 795 + .remove = ad7746_remove, 796 796 .id_table = ad7746_id, 797 797 }; 798 798 module_i2c_driver(ad7746_driver);
+1 -1
drivers/staging/iio/frequency/ad5930.c
··· 141 141 .owner = THIS_MODULE, 142 142 }, 143 143 .probe = ad5930_probe, 144 - .remove = __devexit_p(ad5930_remove), 144 + .remove = ad5930_remove, 145 145 }; 146 146 module_spi_driver(ad5930_driver); 147 147
+1 -1
drivers/staging/iio/frequency/ad9832.c
··· 352 352 .owner = THIS_MODULE, 353 353 }, 354 354 .probe = ad9832_probe, 355 - .remove = __devexit_p(ad9832_remove), 355 + .remove = ad9832_remove, 356 356 .id_table = ad9832_id, 357 357 }; 358 358 module_spi_driver(ad9832_driver);
+1 -1
drivers/staging/iio/frequency/ad9834.c
··· 454 454 .owner = THIS_MODULE, 455 455 }, 456 456 .probe = ad9834_probe, 457 - .remove = __devexit_p(ad9834_remove), 457 + .remove = ad9834_remove, 458 458 .id_table = ad9834_id, 459 459 }; 460 460 module_spi_driver(ad9834_driver);
+1 -1
drivers/staging/iio/frequency/ad9850.c
··· 127 127 .owner = THIS_MODULE, 128 128 }, 129 129 .probe = ad9850_probe, 130 - .remove = __devexit_p(ad9850_remove), 130 + .remove = ad9850_remove, 131 131 }; 132 132 module_spi_driver(ad9850_driver); 133 133
+1 -1
drivers/staging/iio/frequency/ad9852.c
··· 278 278 .owner = THIS_MODULE, 279 279 }, 280 280 .probe = ad9852_probe, 281 - .remove = __devexit_p(ad9852_remove), 281 + .remove = ad9852_remove, 282 282 }; 283 283 module_spi_driver(ad9852_driver); 284 284
+1 -1
drivers/staging/iio/frequency/ad9910.c
··· 411 411 .owner = THIS_MODULE, 412 412 }, 413 413 .probe = ad9910_probe, 414 - .remove = __devexit_p(ad9910_remove), 414 + .remove = ad9910_remove, 415 415 }; 416 416 module_spi_driver(ad9910_driver); 417 417
+1 -1
drivers/staging/iio/frequency/ad9951.c
··· 222 222 .owner = THIS_MODULE, 223 223 }, 224 224 .probe = ad9951_probe, 225 - .remove = __devexit_p(ad9951_remove), 225 + .remove = ad9951_remove, 226 226 }; 227 227 module_spi_driver(ad9951_driver); 228 228
+2 -2
drivers/staging/iio/gyro/adis16060_core.c
··· 221 221 .owner = THIS_MODULE, 222 222 }, 223 223 .probe = adis16060_r_probe, 224 - .remove = __devexit_p(adis16060_r_remove), 224 + .remove = adis16060_r_remove, 225 225 }; 226 226 227 227 static struct spi_driver adis16060_w_driver = { ··· 230 230 .owner = THIS_MODULE, 231 231 }, 232 232 .probe = adis16060_w_probe, 233 - .remove = __devexit_p(adis16060_w_remove), 233 + .remove = adis16060_w_remove, 234 234 }; 235 235 236 236 static __init int adis16060_init(void)
+1 -1
drivers/staging/iio/gyro/adis16080_core.c
··· 191 191 .owner = THIS_MODULE, 192 192 }, 193 193 .probe = adis16080_probe, 194 - .remove = __devexit_p(adis16080_remove), 194 + .remove = adis16080_remove, 195 195 }; 196 196 module_spi_driver(adis16080_driver); 197 197
+1 -1
drivers/staging/iio/gyro/adis16130_core.c
··· 168 168 .owner = THIS_MODULE, 169 169 }, 170 170 .probe = adis16130_probe, 171 - .remove = __devexit_p(adis16130_remove), 171 + .remove = adis16130_remove, 172 172 }; 173 173 module_spi_driver(adis16130_driver); 174 174
+1 -1
drivers/staging/iio/gyro/adis16260_core.c
··· 417 417 .owner = THIS_MODULE, 418 418 }, 419 419 .probe = adis16260_probe, 420 - .remove = __devexit_p(adis16260_remove), 420 + .remove = adis16260_remove, 421 421 .id_table = adis16260_id, 422 422 }; 423 423 module_spi_driver(adis16260_driver);
+1 -1
drivers/staging/iio/gyro/adxrs450_core.c
··· 430 430 .owner = THIS_MODULE, 431 431 }, 432 432 .probe = adxrs450_probe, 433 - .remove = __devexit_p(adxrs450_remove), 433 + .remove = adxrs450_remove, 434 434 .id_table = adxrs450_id, 435 435 }; 436 436 module_spi_driver(adxrs450_driver);
+1 -1
drivers/staging/iio/iio_hwmon.c
··· 189 189 .owner = THIS_MODULE, 190 190 }, 191 191 .probe = iio_hwmon_probe, 192 - .remove = __devexit_p(iio_hwmon_remove), 192 + .remove = iio_hwmon_remove, 193 193 }; 194 194 195 195 module_platform_driver(iio_hwmon_driver);
+1 -1
drivers/staging/iio/impedance-analyzer/ad5933.c
··· 817 817 .name = "ad5933", 818 818 }, 819 819 .probe = ad5933_probe, 820 - .remove = __devexit_p(ad5933_remove), 820 + .remove = ad5933_remove, 821 821 .id_table = ad5933_id, 822 822 }; 823 823 module_i2c_driver(ad5933_driver);
+1 -1
drivers/staging/iio/imu/adis16400_core.c
··· 1311 1311 }, 1312 1312 .id_table = adis16400_id, 1313 1313 .probe = adis16400_probe, 1314 - .remove = __devexit_p(adis16400_remove), 1314 + .remove = adis16400_remove, 1315 1315 }; 1316 1316 module_spi_driver(adis16400_driver); 1317 1317
+1 -1
drivers/staging/iio/light/isl29018.c
··· 669 669 .of_match_table = isl29018_of_match, 670 670 }, 671 671 .probe = isl29018_probe, 672 - .remove = __devexit_p(isl29018_remove), 672 + .remove = isl29018_remove, 673 673 .id_table = isl29018_id, 674 674 }; 675 675 module_i2c_driver(isl29018_driver);
+1 -1
drivers/staging/iio/light/isl29028.c
··· 555 555 .of_match_table = isl29028_of_match, 556 556 }, 557 557 .probe = isl29028_probe, 558 - .remove = __devexit_p(isl29028_remove), 558 + .remove = isl29028_remove, 559 559 .id_table = isl29028_id, 560 560 }; 561 561
+1 -1
drivers/staging/iio/light/tsl2563.c
··· 889 889 .pm = TSL2563_PM_OPS, 890 890 }, 891 891 .probe = tsl2563_probe, 892 - .remove = __devexit_p(tsl2563_remove), 892 + .remove = tsl2563_remove, 893 893 .id_table = tsl2563_id, 894 894 }; 895 895 module_i2c_driver(tsl2563_i2c_driver);
+1 -1
drivers/staging/iio/light/tsl2583.c
··· 947 947 }, 948 948 .id_table = taos_idtable, 949 949 .probe = taos_probe, 950 - .remove = __devexit_p(taos_remove), 950 + .remove = taos_remove, 951 951 }; 952 952 module_i2c_driver(taos_driver); 953 953
+1 -1
drivers/staging/iio/light/tsl2x7x_core.c
··· 2070 2070 }, 2071 2071 .id_table = tsl2x7x_idtable, 2072 2072 .probe = tsl2x7x_probe, 2073 - .remove = __devexit_p(tsl2x7x_remove), 2073 + .remove = tsl2x7x_remove, 2074 2074 }; 2075 2075 2076 2076 module_i2c_driver(tsl2x7x_driver);
+1 -1
drivers/staging/iio/magnetometer/ak8975.c
··· 510 510 .of_match_table = ak8975_of_match, 511 511 }, 512 512 .probe = ak8975_probe, 513 - .remove = __devexit_p(ak8975_remove), 513 + .remove = ak8975_remove, 514 514 .id_table = ak8975_id, 515 515 }; 516 516 module_i2c_driver(ak8975_driver);
+1 -1
drivers/staging/iio/magnetometer/hmc5843.c
··· 755 755 }, 756 756 .id_table = hmc5843_id, 757 757 .probe = hmc5843_probe, 758 - .remove = __devexit_p(hmc5843_remove), 758 + .remove = hmc5843_remove, 759 759 .detect = hmc5843_detect, 760 760 .address_list = normal_i2c, 761 761 };
+1 -1
drivers/staging/iio/meter/ade7753.c
··· 572 572 .owner = THIS_MODULE, 573 573 }, 574 574 .probe = ade7753_probe, 575 - .remove = __devexit_p(ade7753_remove), 575 + .remove = ade7753_remove, 576 576 }; 577 577 module_spi_driver(ade7753_driver); 578 578
+1 -1
drivers/staging/iio/meter/ade7754.c
··· 594 594 .owner = THIS_MODULE, 595 595 }, 596 596 .probe = ade7754_probe, 597 - .remove = __devexit_p(ade7754_remove), 597 + .remove = ade7754_remove, 598 598 }; 599 599 module_spi_driver(ade7754_driver); 600 600
+1 -1
drivers/staging/iio/meter/ade7758_core.c
··· 992 992 .owner = THIS_MODULE, 993 993 }, 994 994 .probe = ade7758_probe, 995 - .remove = __devexit_p(ade7758_remove), 995 + .remove = ade7758_remove, 996 996 .id_table = ade7758_id, 997 997 }; 998 998 module_spi_driver(ade7758_driver);
+1 -1
drivers/staging/iio/meter/ade7759.c
··· 516 516 .owner = THIS_MODULE, 517 517 }, 518 518 .probe = ade7759_probe, 519 - .remove = __devexit_p(ade7759_remove), 519 + .remove = ade7759_remove, 520 520 }; 521 521 module_spi_driver(ade7759_driver); 522 522
+1 -1
drivers/staging/iio/meter/ade7854-i2c.c
··· 250 250 .name = "ade7854", 251 251 }, 252 252 .probe = ade7854_i2c_probe, 253 - .remove = __devexit_p(ade7854_i2c_remove), 253 + .remove = ade7854_i2c_remove, 254 254 .id_table = ade7854_id, 255 255 }; 256 256 module_i2c_driver(ade7854_i2c_driver);
+1 -1
drivers/staging/iio/meter/ade7854-spi.c
··· 351 351 .owner = THIS_MODULE, 352 352 }, 353 353 .probe = ade7854_spi_probe, 354 - .remove = __devexit_p(ade7854_spi_remove), 354 + .remove = ade7854_spi_remove, 355 355 .id_table = ade7854_id, 356 356 }; 357 357 module_spi_driver(ade7854_driver);
+1 -1
drivers/staging/iio/resolver/ad2s1200.c
··· 170 170 .owner = THIS_MODULE, 171 171 }, 172 172 .probe = ad2s1200_probe, 173 - .remove = __devexit_p(ad2s1200_remove), 173 + .remove = ad2s1200_remove, 174 174 .id_table = ad2s1200_id, 175 175 }; 176 176 module_spi_driver(ad2s1200_driver);
+1 -1
drivers/staging/iio/resolver/ad2s1210.c
··· 759 759 .owner = THIS_MODULE, 760 760 }, 761 761 .probe = ad2s1210_probe, 762 - .remove = __devexit_p(ad2s1210_remove), 762 + .remove = ad2s1210_remove, 763 763 .id_table = ad2s1210_id, 764 764 }; 765 765 module_spi_driver(ad2s1210_driver);
+1 -1
drivers/staging/iio/resolver/ad2s90.c
··· 118 118 .owner = THIS_MODULE, 119 119 }, 120 120 .probe = ad2s90_probe, 121 - .remove = __devexit_p(ad2s90_remove), 121 + .remove = ad2s90_remove, 122 122 .id_table = ad2s90_id, 123 123 }; 124 124 module_spi_driver(ad2s90_driver);
+1 -1
drivers/staging/iio/trigger/iio-trig-bfin-timer.c
··· 296 296 .owner = THIS_MODULE, 297 297 }, 298 298 .probe = iio_bfin_tmr_trigger_probe, 299 - .remove = __devexit_p(iio_bfin_tmr_trigger_remove), 299 + .remove = iio_bfin_tmr_trigger_remove, 300 300 }; 301 301 302 302 module_platform_driver(iio_bfin_tmr_trigger_driver);
+1 -1
drivers/staging/iio/trigger/iio-trig-gpio.c
··· 153 153 154 154 static struct platform_driver iio_gpio_trigger_driver = { 155 155 .probe = iio_gpio_trigger_probe, 156 - .remove = __devexit_p(iio_gpio_trigger_remove), 156 + .remove = iio_gpio_trigger_remove, 157 157 .driver = { 158 158 .name = "iio_gpio_trigger", 159 159 .owner = THIS_MODULE,
+1 -1
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
··· 188 188 189 189 static struct platform_driver iio_trig_periodic_rtc_driver = { 190 190 .probe = iio_trig_periodic_rtc_probe, 191 - .remove = __devexit_p(iio_trig_periodic_rtc_remove), 191 + .remove = iio_trig_periodic_rtc_remove, 192 192 .driver = { 193 193 .name = "iio_prtc_trigger", 194 194 .owner = THIS_MODULE,