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

regulator: 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>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Bill Pemberton and committed by
Mark Brown
8dc995f5 ce6dd5da

+62 -62
+1 -1
drivers/regulator/88pm8607.c
··· 454 454 return 0; 455 455 } 456 456 457 - static int __devexit pm8607_regulator_remove(struct platform_device *pdev) 457 + static int pm8607_regulator_remove(struct platform_device *pdev) 458 458 { 459 459 struct pm8607_regulator_info *info = platform_get_drvdata(pdev); 460 460
+1 -1
drivers/regulator/aat2870-regulator.c
··· 187 187 return 0; 188 188 } 189 189 190 - static int __devexit aat2870_regulator_remove(struct platform_device *pdev) 190 + static int aat2870_regulator_remove(struct platform_device *pdev) 191 191 { 192 192 struct regulator_dev *rdev = platform_get_drvdata(pdev); 193 193
+1 -1
drivers/regulator/ab3100.c
··· 571 571 return 0; 572 572 } 573 573 574 - static int __devexit ab3100_regulators_remove(struct platform_device *pdev) 574 + static int ab3100_regulators_remove(struct platform_device *pdev) 575 575 { 576 576 int i; 577 577
+1 -1
drivers/regulator/ab8500.c
··· 817 817 return 0; 818 818 } 819 819 820 - static __devexit int ab8500_regulator_remove(struct platform_device *pdev) 820 + static int ab8500_regulator_remove(struct platform_device *pdev) 821 821 { 822 822 int i; 823 823
+1 -1
drivers/regulator/ad5398.c
··· 256 256 return ret; 257 257 } 258 258 259 - static int __devexit ad5398_remove(struct i2c_client *client) 259 + static int ad5398_remove(struct i2c_client *client) 260 260 { 261 261 struct ad5398_chip_info *chip = i2c_get_clientdata(client); 262 262
+1 -1
drivers/regulator/anatop-regulator.c
··· 186 186 return ret; 187 187 } 188 188 189 - static int __devexit anatop_regulator_remove(struct platform_device *pdev) 189 + static int anatop_regulator_remove(struct platform_device *pdev) 190 190 { 191 191 struct regulator_dev *rdev = platform_get_drvdata(pdev); 192 192 struct anatop_regulator *sreg = rdev_get_drvdata(rdev);
+1 -1
drivers/regulator/arizona-ldo1.c
··· 115 115 return 0; 116 116 } 117 117 118 - static __devexit int arizona_ldo1_remove(struct platform_device *pdev) 118 + static int arizona_ldo1_remove(struct platform_device *pdev) 119 119 { 120 120 struct arizona_ldo1 *ldo1 = platform_get_drvdata(pdev); 121 121
+1 -1
drivers/regulator/arizona-micsupp.c
··· 166 166 return 0; 167 167 } 168 168 169 - static __devexit int arizona_micsupp_remove(struct platform_device *pdev) 169 + static int arizona_micsupp_remove(struct platform_device *pdev) 170 170 { 171 171 struct arizona_micsupp *micsupp = platform_get_drvdata(pdev); 172 172
+1 -1
drivers/regulator/da903x.c
··· 499 499 return 0; 500 500 } 501 501 502 - static int __devexit da903x_regulator_remove(struct platform_device *pdev) 502 + static int da903x_regulator_remove(struct platform_device *pdev) 503 503 { 504 504 struct regulator_dev *rdev = platform_get_drvdata(pdev); 505 505
+1 -1
drivers/regulator/da9052-regulator.c
··· 430 430 return 0; 431 431 } 432 432 433 - static int __devexit da9052_regulator_remove(struct platform_device *pdev) 433 + static int da9052_regulator_remove(struct platform_device *pdev) 434 434 { 435 435 struct da9052_regulator *regulator = platform_get_drvdata(pdev); 436 436
+1 -1
drivers/regulator/dbx500-prcmu.c
··· 230 230 return -ENOMEM; 231 231 } 232 232 233 - int __devexit ux500_regulator_debug_exit(void) 233 + int ux500_regulator_debug_exit(void) 234 234 { 235 235 debugfs_remove_recursive(rdebug.dir); 236 236 kfree(rdebug.state_after_suspend);
+1 -1
drivers/regulator/fan53555.c
··· 293 293 294 294 } 295 295 296 - static int __devexit fan53555_regulator_remove(struct i2c_client *client) 296 + static int fan53555_regulator_remove(struct i2c_client *client) 297 297 { 298 298 struct fan53555_device_info *di = i2c_get_clientdata(client); 299 299
+1 -1
drivers/regulator/fixed.c
··· 234 234 return ret; 235 235 } 236 236 237 - static int __devexit reg_fixed_voltage_remove(struct platform_device *pdev) 237 + static int reg_fixed_voltage_remove(struct platform_device *pdev) 238 238 { 239 239 struct fixed_voltage_data *drvdata = platform_get_drvdata(pdev); 240 240
+1 -1
drivers/regulator/gpio-regulator.c
··· 348 348 return ret; 349 349 } 350 350 351 - static int __devexit gpio_regulator_remove(struct platform_device *pdev) 351 + static int gpio_regulator_remove(struct platform_device *pdev) 352 352 { 353 353 struct gpio_regulator_data *drvdata = platform_get_drvdata(pdev); 354 354
+1 -1
drivers/regulator/isl6271a-regulator.c
··· 151 151 return err; 152 152 } 153 153 154 - static int __devexit isl6271a_remove(struct i2c_client *i2c) 154 + static int isl6271a_remove(struct i2c_client *i2c) 155 155 { 156 156 struct isl_pmic *pmic = i2c_get_clientdata(i2c); 157 157 int i;
+1 -1
drivers/regulator/lp3971.c
··· 472 472 return ret; 473 473 } 474 474 475 - static int __devexit lp3971_i2c_remove(struct i2c_client *i2c) 475 + static int lp3971_i2c_remove(struct i2c_client *i2c) 476 476 { 477 477 struct lp3971 *lp3971 = i2c_get_clientdata(i2c); 478 478 int i;
+1 -1
drivers/regulator/lp3972.c
··· 569 569 return ret; 570 570 } 571 571 572 - static int __devexit lp3972_i2c_remove(struct i2c_client *i2c) 572 + static int lp3972_i2c_remove(struct i2c_client *i2c) 573 573 { 574 574 struct lp3972 *lp3972 = i2c_get_clientdata(i2c); 575 575 int i;
+1 -1
drivers/regulator/lp872x.c
··· 893 893 return ret; 894 894 } 895 895 896 - static int __devexit lp872x_remove(struct i2c_client *cl) 896 + static int lp872x_remove(struct i2c_client *cl) 897 897 { 898 898 struct lp872x *lp = i2c_get_clientdata(cl); 899 899
+1 -1
drivers/regulator/lp8788-buck.c
··· 542 542 return 0; 543 543 } 544 544 545 - static int __devexit lp8788_buck_remove(struct platform_device *pdev) 545 + static int lp8788_buck_remove(struct platform_device *pdev) 546 546 { 547 547 struct lp8788_buck *buck = platform_get_drvdata(pdev); 548 548
+2 -2
drivers/regulator/lp8788-ldo.c
··· 749 749 return 0; 750 750 } 751 751 752 - static int __devexit lp8788_dldo_remove(struct platform_device *pdev) 752 + static int lp8788_dldo_remove(struct platform_device *pdev) 753 753 { 754 754 struct lp8788_ldo *ldo = platform_get_drvdata(pdev); 755 755 ··· 805 805 return 0; 806 806 } 807 807 808 - static int __devexit lp8788_aldo_remove(struct platform_device *pdev) 808 + static int lp8788_aldo_remove(struct platform_device *pdev) 809 809 { 810 810 struct lp8788_ldo *ldo = platform_get_drvdata(pdev); 811 811
+1 -1
drivers/regulator/max1586.c
··· 188 188 return ret; 189 189 } 190 190 191 - static int __devexit max1586_pmic_remove(struct i2c_client *client) 191 + static int max1586_pmic_remove(struct i2c_client *client) 192 192 { 193 193 struct max1586_data *max1586 = i2c_get_clientdata(client); 194 194 int i;
+1 -1
drivers/regulator/max77686.c
··· 337 337 return ret; 338 338 } 339 339 340 - static int __devexit max77686_pmic_remove(struct platform_device *pdev) 340 + static int max77686_pmic_remove(struct platform_device *pdev) 341 341 { 342 342 struct max77686_data *max77686 = platform_get_drvdata(pdev); 343 343 int i;
+1 -1
drivers/regulator/max8649.c
··· 271 271 return 0; 272 272 } 273 273 274 - static int __devexit max8649_regulator_remove(struct i2c_client *client) 274 + static int max8649_regulator_remove(struct i2c_client *client) 275 275 { 276 276 struct max8649_regulator_info *info = i2c_get_clientdata(client); 277 277
+1 -1
drivers/regulator/max8660.c
··· 420 420 return ret; 421 421 } 422 422 423 - static int __devexit max8660_remove(struct i2c_client *client) 423 + static int max8660_remove(struct i2c_client *client) 424 424 { 425 425 struct max8660 *max8660 = i2c_get_clientdata(client); 426 426 int i;
+1 -1
drivers/regulator/max8907-regulator.c
··· 368 368 return ret; 369 369 } 370 370 371 - static __devexit int max8907_regulator_remove(struct platform_device *pdev) 371 + static int max8907_regulator_remove(struct platform_device *pdev) 372 372 { 373 373 struct max8907_regulator *pmic = platform_get_drvdata(pdev); 374 374 int i;
+1 -1
drivers/regulator/max8925-regulator.c
··· 323 323 return 0; 324 324 } 325 325 326 - static int __devexit max8925_regulator_remove(struct platform_device *pdev) 326 + static int max8925_regulator_remove(struct platform_device *pdev) 327 327 { 328 328 struct regulator_dev *rdev = platform_get_drvdata(pdev); 329 329
+1 -1
drivers/regulator/max8952.c
··· 247 247 return 0; 248 248 } 249 249 250 - static int __devexit max8952_pmic_remove(struct i2c_client *client) 250 + static int max8952_pmic_remove(struct i2c_client *client) 251 251 { 252 252 struct max8952_data *max8952 = i2c_get_clientdata(client); 253 253 struct max8952_platform_data *pdata = max8952->pdata;
+1 -1
drivers/regulator/max8997.c
··· 1120 1120 return ret; 1121 1121 } 1122 1122 1123 - static int __devexit max8997_pmic_remove(struct platform_device *pdev) 1123 + static int max8997_pmic_remove(struct platform_device *pdev) 1124 1124 { 1125 1125 struct max8997_data *max8997 = platform_get_drvdata(pdev); 1126 1126 struct regulator_dev **rdev = max8997->rdev;
+1 -1
drivers/regulator/max8998.c
··· 818 818 return ret; 819 819 } 820 820 821 - static int __devexit max8998_pmic_remove(struct platform_device *pdev) 821 + static int max8998_pmic_remove(struct platform_device *pdev) 822 822 { 823 823 struct max8998_data *max8998 = platform_get_drvdata(pdev); 824 824 struct regulator_dev **rdev = max8998->rdev;
+1 -1
drivers/regulator/mc13783-regulator.c
··· 445 445 return ret; 446 446 } 447 447 448 - static int __devexit mc13783_regulator_remove(struct platform_device *pdev) 448 + static int mc13783_regulator_remove(struct platform_device *pdev) 449 449 { 450 450 struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev); 451 451 struct mc13xxx_regulator_platform_data *pdata =
+1 -1
drivers/regulator/mc13892-regulator.c
··· 588 588 return ret; 589 589 } 590 590 591 - static int __devexit mc13892_regulator_remove(struct platform_device *pdev) 591 + static int mc13892_regulator_remove(struct platform_device *pdev) 592 592 { 593 593 struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev); 594 594 int i;
+1 -1
drivers/regulator/palmas-regulator.c
··· 868 868 return ret; 869 869 } 870 870 871 - static int __devexit palmas_remove(struct platform_device *pdev) 871 + static int palmas_remove(struct platform_device *pdev) 872 872 { 873 873 struct palmas_pmic *pmic = platform_get_drvdata(pdev); 874 874 int id;
+1 -1
drivers/regulator/pcap-regulator.c
··· 255 255 return 0; 256 256 } 257 257 258 - static int __devexit pcap_regulator_remove(struct platform_device *pdev) 258 + static int pcap_regulator_remove(struct platform_device *pdev) 259 259 { 260 260 struct regulator_dev *rdev = platform_get_drvdata(pdev); 261 261
+1 -1
drivers/regulator/pcf50633-regulator.c
··· 222 222 return 0; 223 223 } 224 224 225 - static int __devexit pcf50633_regulator_remove(struct platform_device *pdev) 225 + static int pcf50633_regulator_remove(struct platform_device *pdev) 226 226 { 227 227 struct regulator_dev *rdev = platform_get_drvdata(pdev); 228 228
+1 -1
drivers/regulator/rc5t583-regulator.c
··· 198 198 return ret; 199 199 } 200 200 201 - static int __devexit rc5t583_regulator_remove(struct platform_device *pdev) 201 + static int rc5t583_regulator_remove(struct platform_device *pdev) 202 202 { 203 203 struct rc5t583_regulator *regs = platform_get_drvdata(pdev); 204 204 int id;
+1 -1
drivers/regulator/s2mps11.c
··· 307 307 return ret; 308 308 } 309 309 310 - static int __devexit s2mps11_pmic_remove(struct platform_device *pdev) 310 + static int s2mps11_pmic_remove(struct platform_device *pdev) 311 311 { 312 312 struct s2mps11_info *s2mps11 = platform_get_drvdata(pdev); 313 313 int i;
+1 -1
drivers/regulator/s5m8767.c
··· 773 773 return ret; 774 774 } 775 775 776 - static int __devexit s5m8767_pmic_remove(struct platform_device *pdev) 776 + static int s5m8767_pmic_remove(struct platform_device *pdev) 777 777 { 778 778 struct s5m8767_info *s5m8767 = platform_get_drvdata(pdev); 779 779 struct regulator_dev **rdev = s5m8767->rdev;
+1 -1
drivers/regulator/tps51632-regulator.c
··· 290 290 return 0; 291 291 } 292 292 293 - static int __devexit tps51632_remove(struct i2c_client *client) 293 + static int tps51632_remove(struct i2c_client *client) 294 294 { 295 295 struct tps51632_chip *tps = i2c_get_clientdata(client); 296 296
+1 -1
drivers/regulator/tps6105x-regulator.c
··· 159 159 return 0; 160 160 } 161 161 162 - static int __devexit tps6105x_regulator_remove(struct platform_device *pdev) 162 + static int tps6105x_regulator_remove(struct platform_device *pdev) 163 163 { 164 164 struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev); 165 165 regulator_unregister(tps6105x->regulator);
+1 -1
drivers/regulator/tps62360-regulator.c
··· 490 490 * 491 491 * Unregister TPS driver as an i2c client device driver 492 492 */ 493 - static int __devexit tps62360_remove(struct i2c_client *client) 493 + static int tps62360_remove(struct i2c_client *client) 494 494 { 495 495 struct tps62360_chip *tps = i2c_get_clientdata(client); 496 496
+1 -1
drivers/regulator/tps65023-regulator.c
··· 319 319 return error; 320 320 } 321 321 322 - static int __devexit tps_65023_remove(struct i2c_client *client) 322 + static int tps_65023_remove(struct i2c_client *client) 323 323 { 324 324 struct tps_pmic *tps = i2c_get_clientdata(client); 325 325 int i;
+1 -1
drivers/regulator/tps6507x-regulator.c
··· 439 439 return error; 440 440 } 441 441 442 - static int __devexit tps6507x_pmic_remove(struct platform_device *pdev) 442 + static int tps6507x_pmic_remove(struct platform_device *pdev) 443 443 { 444 444 struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev); 445 445 struct tps6507x_pmic *tps = tps6507x_dev->pmic;
+1 -1
drivers/regulator/tps65090-regulator.c
··· 232 232 return ret; 233 233 } 234 234 235 - static int __devexit tps65090_regulator_remove(struct platform_device *pdev) 235 + static int tps65090_regulator_remove(struct platform_device *pdev) 236 236 { 237 237 struct tps65090_regulator *pmic = platform_get_drvdata(pdev); 238 238 struct tps65090_regulator *ri;
+1 -1
drivers/regulator/tps65217-regulator.c
··· 397 397 return ret; 398 398 } 399 399 400 - static int __devexit tps65217_regulator_remove(struct platform_device *pdev) 400 + static int tps65217_regulator_remove(struct platform_device *pdev) 401 401 { 402 402 struct tps65217 *tps = platform_get_drvdata(pdev); 403 403 unsigned int i;
+1 -1
drivers/regulator/tps6586x-regulator.c
··· 461 461 return err; 462 462 } 463 463 464 - static int __devexit tps6586x_regulator_remove(struct platform_device *pdev) 464 + static int tps6586x_regulator_remove(struct platform_device *pdev) 465 465 { 466 466 struct regulator_dev **rdev = platform_get_drvdata(pdev); 467 467 int id = TPS6586X_ID_MAX_REGULATOR;
+1 -1
drivers/regulator/tps65910-regulator.c
··· 1184 1184 return err; 1185 1185 } 1186 1186 1187 - static int __devexit tps65910_remove(struct platform_device *pdev) 1187 + static int tps65910_remove(struct platform_device *pdev) 1188 1188 { 1189 1189 struct tps65910_reg *pmic = platform_get_drvdata(pdev); 1190 1190 int i;
+1 -1
drivers/regulator/tps65912-regulator.c
··· 525 525 return err; 526 526 } 527 527 528 - static int __devexit tps65912_remove(struct platform_device *pdev) 528 + static int tps65912_remove(struct platform_device *pdev) 529 529 { 530 530 struct tps65912_reg *tps65912_reg = platform_get_drvdata(pdev); 531 531 int i;
+1 -1
drivers/regulator/tps80031-regulator.c
··· 753 753 return ret; 754 754 } 755 755 756 - static int __devexit tps80031_regulator_remove(struct platform_device *pdev) 756 + static int tps80031_regulator_remove(struct platform_device *pdev) 757 757 { 758 758 struct tps80031_regulator *pmic = platform_get_drvdata(pdev); 759 759 struct tps80031_regulator *ri = NULL;
+1 -1
drivers/regulator/twl-regulator.c
··· 1241 1241 return 0; 1242 1242 } 1243 1243 1244 - static int __devexit twlreg_remove(struct platform_device *pdev) 1244 + static int twlreg_remove(struct platform_device *pdev) 1245 1245 { 1246 1246 struct regulator_dev *rdev = platform_get_drvdata(pdev); 1247 1247 struct twlreg_info *info = rdev->reg_data;
+1 -1
drivers/regulator/vexpress.c
··· 114 114 return err; 115 115 } 116 116 117 - static int __devexit vexpress_regulator_remove(struct platform_device *pdev) 117 + static int vexpress_regulator_remove(struct platform_device *pdev) 118 118 { 119 119 struct vexpress_regulator *reg = platform_get_drvdata(pdev); 120 120
+1 -1
drivers/regulator/virtual.c
··· 321 321 return 0; 322 322 } 323 323 324 - static int __devexit regulator_virtual_remove(struct platform_device *pdev) 324 + static int regulator_virtual_remove(struct platform_device *pdev) 325 325 { 326 326 struct virtual_consumer_data *drvdata = platform_get_drvdata(pdev); 327 327
+4 -4
drivers/regulator/wm831x-dcdc.c
··· 562 562 return ret; 563 563 } 564 564 565 - static __devexit int wm831x_buckv_remove(struct platform_device *pdev) 565 + static int wm831x_buckv_remove(struct platform_device *pdev) 566 566 { 567 567 struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); 568 568 struct wm831x *wm831x = dcdc->wm831x; ··· 710 710 return ret; 711 711 } 712 712 713 - static __devexit int wm831x_buckp_remove(struct platform_device *pdev) 713 + static int wm831x_buckp_remove(struct platform_device *pdev) 714 714 { 715 715 struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); 716 716 ··· 845 845 return ret; 846 846 } 847 847 848 - static __devexit int wm831x_boostp_remove(struct platform_device *pdev) 848 + static int wm831x_boostp_remove(struct platform_device *pdev) 849 849 { 850 850 struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); 851 851 ··· 936 936 return ret; 937 937 } 938 938 939 - static __devexit int wm831x_epe_remove(struct platform_device *pdev) 939 + static int wm831x_epe_remove(struct platform_device *pdev) 940 940 { 941 941 struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); 942 942
+1 -1
drivers/regulator/wm831x-isink.c
··· 221 221 return ret; 222 222 } 223 223 224 - static __devexit int wm831x_isink_remove(struct platform_device *pdev) 224 + static int wm831x_isink_remove(struct platform_device *pdev) 225 225 { 226 226 struct wm831x_isink *isink = platform_get_drvdata(pdev); 227 227
+3 -3
drivers/regulator/wm831x-ldo.c
··· 334 334 return ret; 335 335 } 336 336 337 - static __devexit int wm831x_gp_ldo_remove(struct platform_device *pdev) 337 + static int wm831x_gp_ldo_remove(struct platform_device *pdev) 338 338 { 339 339 struct wm831x_ldo *ldo = platform_get_drvdata(pdev); 340 340 ··· 590 590 return ret; 591 591 } 592 592 593 - static __devexit int wm831x_aldo_remove(struct platform_device *pdev) 593 + static int wm831x_aldo_remove(struct platform_device *pdev) 594 594 { 595 595 struct wm831x_ldo *ldo = platform_get_drvdata(pdev); 596 596 ··· 737 737 return ret; 738 738 } 739 739 740 - static __devexit int wm831x_alive_ldo_remove(struct platform_device *pdev) 740 + static int wm831x_alive_ldo_remove(struct platform_device *pdev) 741 741 { 742 742 struct wm831x_ldo *ldo = platform_get_drvdata(pdev); 743 743
+1 -1
drivers/regulator/wm8400-regulator.c
··· 246 246 return 0; 247 247 } 248 248 249 - static int __devexit wm8400_regulator_remove(struct platform_device *pdev) 249 + static int wm8400_regulator_remove(struct platform_device *pdev) 250 250 { 251 251 struct regulator_dev *rdev = platform_get_drvdata(pdev); 252 252
+1 -1
drivers/regulator/wm8994-regulator.c
··· 142 142 return ret; 143 143 } 144 144 145 - static __devexit int wm8994_ldo_remove(struct platform_device *pdev) 145 + static int wm8994_ldo_remove(struct platform_device *pdev) 146 146 { 147 147 struct wm8994_ldo *ldo = platform_get_drvdata(pdev); 148 148