diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:26:10 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-19 20:53:38 -0500 |
commit | 8dc995f56ef7aedb41873fdeaa1971f3aa166ebd (patch) | |
tree | 9d19c16df8570d571a54b2913dae54e36e635c50 | |
parent | ce6dd5da9dfcf9232df09d8d486cd6ed25e29cdc (diff) |
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>
56 files changed, 62 insertions, 62 deletions
diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c index c09b5d97f4e7..2b557119adad 100644 --- a/drivers/regulator/88pm8607.c +++ b/drivers/regulator/88pm8607.c | |||
@@ -454,7 +454,7 @@ static int pm8607_regulator_probe(struct platform_device *pdev) | |||
454 | return 0; | 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 | struct pm8607_regulator_info *info = platform_get_drvdata(pdev); | 459 | struct pm8607_regulator_info *info = platform_get_drvdata(pdev); |
460 | 460 | ||
diff --git a/drivers/regulator/aat2870-regulator.c b/drivers/regulator/aat2870-regulator.c index 4285b304e2b5..8b5876356db9 100644 --- a/drivers/regulator/aat2870-regulator.c +++ b/drivers/regulator/aat2870-regulator.c | |||
@@ -187,7 +187,7 @@ static int aat2870_regulator_probe(struct platform_device *pdev) | |||
187 | return 0; | 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 | struct regulator_dev *rdev = platform_get_drvdata(pdev); | 192 | struct regulator_dev *rdev = platform_get_drvdata(pdev); |
193 | 193 | ||
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c index 7a04d5fe4e93..111ec69a3e94 100644 --- a/drivers/regulator/ab3100.c +++ b/drivers/regulator/ab3100.c | |||
@@ -571,7 +571,7 @@ static int ab3100_regulators_probe(struct platform_device *pdev) | |||
571 | return 0; | 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 | int i; | 576 | int i; |
577 | 577 | ||
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c index af81325b8e2f..09014f38a948 100644 --- a/drivers/regulator/ab8500.c +++ b/drivers/regulator/ab8500.c | |||
@@ -817,7 +817,7 @@ static int ab8500_regulator_probe(struct platform_device *pdev) | |||
817 | return 0; | 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 | int i; | 822 | int i; |
823 | 823 | ||
diff --git a/drivers/regulator/ad5398.c b/drivers/regulator/ad5398.c index cd855d9ac38a..6b981b5faa70 100644 --- a/drivers/regulator/ad5398.c +++ b/drivers/regulator/ad5398.c | |||
@@ -256,7 +256,7 @@ err: | |||
256 | return ret; | 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 | struct ad5398_chip_info *chip = i2c_get_clientdata(client); | 261 | struct ad5398_chip_info *chip = i2c_get_clientdata(client); |
262 | 262 | ||
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c index a900c2992f25..1aa5246c79d9 100644 --- a/drivers/regulator/anatop-regulator.c +++ b/drivers/regulator/anatop-regulator.c | |||
@@ -186,7 +186,7 @@ anatop_probe_end: | |||
186 | return ret; | 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 | struct regulator_dev *rdev = platform_get_drvdata(pdev); | 191 | struct regulator_dev *rdev = platform_get_drvdata(pdev); |
192 | struct anatop_regulator *sreg = rdev_get_drvdata(rdev); | 192 | struct anatop_regulator *sreg = rdev_get_drvdata(rdev); |
diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index 7e9ad7cb8676..b44fa6f0e947 100644 --- a/drivers/regulator/arizona-ldo1.c +++ b/drivers/regulator/arizona-ldo1.c | |||
@@ -115,7 +115,7 @@ static int arizona_ldo1_probe(struct platform_device *pdev) | |||
115 | return 0; | 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 | struct arizona_ldo1 *ldo1 = platform_get_drvdata(pdev); | 120 | struct arizona_ldo1 *ldo1 = platform_get_drvdata(pdev); |
121 | 121 | ||
diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c index 3c3631c044fd..5ae2d3e794bf 100644 --- a/drivers/regulator/arizona-micsupp.c +++ b/drivers/regulator/arizona-micsupp.c | |||
@@ -166,7 +166,7 @@ static int arizona_micsupp_probe(struct platform_device *pdev) | |||
166 | return 0; | 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 | struct arizona_micsupp *micsupp = platform_get_drvdata(pdev); | 171 | struct arizona_micsupp *micsupp = platform_get_drvdata(pdev); |
172 | 172 | ||
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c index ab4a6d677280..2afa5730f324 100644 --- a/drivers/regulator/da903x.c +++ b/drivers/regulator/da903x.c | |||
@@ -499,7 +499,7 @@ static int da903x_regulator_probe(struct platform_device *pdev) | |||
499 | return 0; | 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 | struct regulator_dev *rdev = platform_get_drvdata(pdev); | 504 | struct regulator_dev *rdev = platform_get_drvdata(pdev); |
505 | 505 | ||
diff --git a/drivers/regulator/da9052-regulator.c b/drivers/regulator/da9052-regulator.c index ba703d80a21f..d6fbfd3dced5 100644 --- a/drivers/regulator/da9052-regulator.c +++ b/drivers/regulator/da9052-regulator.c | |||
@@ -430,7 +430,7 @@ static int da9052_regulator_probe(struct platform_device *pdev) | |||
430 | return 0; | 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 | struct da9052_regulator *regulator = platform_get_drvdata(pdev); | 435 | struct da9052_regulator *regulator = platform_get_drvdata(pdev); |
436 | 436 | ||
diff --git a/drivers/regulator/dbx500-prcmu.c b/drivers/regulator/dbx500-prcmu.c index afc3e89940ed..261f3d2299bc 100644 --- a/drivers/regulator/dbx500-prcmu.c +++ b/drivers/regulator/dbx500-prcmu.c | |||
@@ -230,7 +230,7 @@ exit_no_debugfs: | |||
230 | return -ENOMEM; | 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 | debugfs_remove_recursive(rdebug.dir); | 235 | debugfs_remove_recursive(rdebug.dir); |
236 | kfree(rdebug.state_after_suspend); | 236 | kfree(rdebug.state_after_suspend); |
diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c index 199172a3bbfa..9165b0c40ed3 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c | |||
@@ -293,7 +293,7 @@ static int fan53555_regulator_probe(struct i2c_client *client, | |||
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 | struct fan53555_device_info *di = i2c_get_clientdata(client); | 298 | struct fan53555_device_info *di = i2c_get_clientdata(client); |
299 | 299 | ||
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index 5aa0be00cc31..48d5b7608b00 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c | |||
@@ -234,7 +234,7 @@ err: | |||
234 | return ret; | 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 | struct fixed_voltage_data *drvdata = platform_get_drvdata(pdev); | 239 | struct fixed_voltage_data *drvdata = platform_get_drvdata(pdev); |
240 | 240 | ||
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 5ffee5ec3660..3ee79c83ae57 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c | |||
@@ -348,7 +348,7 @@ err: | |||
348 | return ret; | 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 | struct gpio_regulator_data *drvdata = platform_get_drvdata(pdev); | 353 | struct gpio_regulator_data *drvdata = platform_get_drvdata(pdev); |
354 | 354 | ||
diff --git a/drivers/regulator/isl6271a-regulator.c b/drivers/regulator/isl6271a-regulator.c index 1732108dda49..d1e5bee2a26b 100644 --- a/drivers/regulator/isl6271a-regulator.c +++ b/drivers/regulator/isl6271a-regulator.c | |||
@@ -151,7 +151,7 @@ error: | |||
151 | return err; | 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 | struct isl_pmic *pmic = i2c_get_clientdata(i2c); | 156 | struct isl_pmic *pmic = i2c_get_clientdata(i2c); |
157 | int i; | 157 | int i; |
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c index 95b7299e3ed2..5f68ff11a298 100644 --- a/drivers/regulator/lp3971.c +++ b/drivers/regulator/lp3971.c | |||
@@ -472,7 +472,7 @@ err_detect: | |||
472 | return ret; | 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 | struct lp3971 *lp3971 = i2c_get_clientdata(i2c); | 477 | struct lp3971 *lp3971 = i2c_get_clientdata(i2c); |
478 | int i; | 478 | int i; |
diff --git a/drivers/regulator/lp3972.c b/drivers/regulator/lp3972.c index acf71beb1f57..69c42c318b87 100644 --- a/drivers/regulator/lp3972.c +++ b/drivers/regulator/lp3972.c | |||
@@ -569,7 +569,7 @@ err_detect: | |||
569 | return ret; | 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 | struct lp3972 *lp3972 = i2c_get_clientdata(i2c); | 574 | struct lp3972 *lp3972 = i2c_get_clientdata(i2c); |
575 | int i; | 575 | int i; |
diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c index 622ad5e5bab0..9289ead715ca 100644 --- a/drivers/regulator/lp872x.c +++ b/drivers/regulator/lp872x.c | |||
@@ -893,7 +893,7 @@ err_dev: | |||
893 | return ret; | 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 | struct lp872x *lp = i2c_get_clientdata(cl); | 898 | struct lp872x *lp = i2c_get_clientdata(cl); |
899 | 899 | ||
diff --git a/drivers/regulator/lp8788-buck.c b/drivers/regulator/lp8788-buck.c index 1a3623ac066c..6cc02c35ddb5 100644 --- a/drivers/regulator/lp8788-buck.c +++ b/drivers/regulator/lp8788-buck.c | |||
@@ -542,7 +542,7 @@ static int lp8788_buck_probe(struct platform_device *pdev) | |||
542 | return 0; | 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 | struct lp8788_buck *buck = platform_get_drvdata(pdev); | 547 | struct lp8788_buck *buck = platform_get_drvdata(pdev); |
548 | 548 | ||
diff --git a/drivers/regulator/lp8788-ldo.c b/drivers/regulator/lp8788-ldo.c index e69a5b62f443..26753a013789 100644 --- a/drivers/regulator/lp8788-ldo.c +++ b/drivers/regulator/lp8788-ldo.c | |||
@@ -749,7 +749,7 @@ static int lp8788_dldo_probe(struct platform_device *pdev) | |||
749 | return 0; | 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 | struct lp8788_ldo *ldo = platform_get_drvdata(pdev); | 754 | struct lp8788_ldo *ldo = platform_get_drvdata(pdev); |
755 | 755 | ||
@@ -805,7 +805,7 @@ static int lp8788_aldo_probe(struct platform_device *pdev) | |||
805 | return 0; | 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 | struct lp8788_ldo *ldo = platform_get_drvdata(pdev); | 810 | struct lp8788_ldo *ldo = platform_get_drvdata(pdev); |
811 | 811 | ||
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c index 1609810a9a3d..3a035ece83c1 100644 --- a/drivers/regulator/max1586.c +++ b/drivers/regulator/max1586.c | |||
@@ -188,7 +188,7 @@ err: | |||
188 | return ret; | 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 | struct max1586_data *max1586 = i2c_get_clientdata(client); | 193 | struct max1586_data *max1586 = i2c_get_clientdata(client); |
194 | int i; | 194 | int i; |
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index da028d055ec7..cb99e9031a64 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c | |||
@@ -337,7 +337,7 @@ err: | |||
337 | return ret; | 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 | struct max77686_data *max77686 = platform_get_drvdata(pdev); | 342 | struct max77686_data *max77686 = platform_get_drvdata(pdev); |
343 | int i; | 343 | int i; |
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c index d4397f95f741..3ca14380f22d 100644 --- a/drivers/regulator/max8649.c +++ b/drivers/regulator/max8649.c | |||
@@ -271,7 +271,7 @@ static int max8649_regulator_probe(struct i2c_client *client, | |||
271 | return 0; | 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 | struct max8649_regulator_info *info = i2c_get_clientdata(client); | 276 | struct max8649_regulator_info *info = i2c_get_clientdata(client); |
277 | 277 | ||
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index a44589f36a31..4d7c635c36c2 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c | |||
@@ -420,7 +420,7 @@ err_out: | |||
420 | return ret; | 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 | struct max8660 *max8660 = i2c_get_clientdata(client); | 425 | struct max8660 *max8660 = i2c_get_clientdata(client); |
426 | int i; | 426 | int i; |
diff --git a/drivers/regulator/max8907-regulator.c b/drivers/regulator/max8907-regulator.c index 99bae75970f1..d1a77512d83e 100644 --- a/drivers/regulator/max8907-regulator.c +++ b/drivers/regulator/max8907-regulator.c | |||
@@ -368,7 +368,7 @@ err_unregister_regulator: | |||
368 | return ret; | 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 | struct max8907_regulator *pmic = platform_get_drvdata(pdev); | 373 | struct max8907_regulator *pmic = platform_get_drvdata(pdev); |
374 | int i; | 374 | int i; |
diff --git a/drivers/regulator/max8925-regulator.c b/drivers/regulator/max8925-regulator.c index cd06708f4af4..446a85445553 100644 --- a/drivers/regulator/max8925-regulator.c +++ b/drivers/regulator/max8925-regulator.c | |||
@@ -323,7 +323,7 @@ static int max8925_regulator_probe(struct platform_device *pdev) | |||
323 | return 0; | 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 | struct regulator_dev *rdev = platform_get_drvdata(pdev); | 328 | struct regulator_dev *rdev = platform_get_drvdata(pdev); |
329 | 329 | ||
diff --git a/drivers/regulator/max8952.c b/drivers/regulator/max8952.c index 21862080fdc8..fc7935a19e3a 100644 --- a/drivers/regulator/max8952.c +++ b/drivers/regulator/max8952.c | |||
@@ -247,7 +247,7 @@ static int max8952_pmic_probe(struct i2c_client *client, | |||
247 | return 0; | 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 | struct max8952_data *max8952 = i2c_get_clientdata(client); | 252 | struct max8952_data *max8952 = i2c_get_clientdata(client); |
253 | struct max8952_platform_data *pdata = max8952->pdata; | 253 | struct max8952_platform_data *pdata = max8952->pdata; |
diff --git a/drivers/regulator/max8997.c b/drivers/regulator/max8997.c index 323ec2b14edb..cea9ec9093eb 100644 --- a/drivers/regulator/max8997.c +++ b/drivers/regulator/max8997.c | |||
@@ -1120,7 +1120,7 @@ err_out: | |||
1120 | return ret; | 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 | struct max8997_data *max8997 = platform_get_drvdata(pdev); | 1125 | struct max8997_data *max8997 = platform_get_drvdata(pdev); |
1126 | struct regulator_dev **rdev = max8997->rdev; | 1126 | struct regulator_dev **rdev = max8997->rdev; |
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c index d80ce6c58ee5..b821d08eb64a 100644 --- a/drivers/regulator/max8998.c +++ b/drivers/regulator/max8998.c | |||
@@ -818,7 +818,7 @@ err_out: | |||
818 | return ret; | 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 | struct max8998_data *max8998 = platform_get_drvdata(pdev); | 823 | struct max8998_data *max8998 = platform_get_drvdata(pdev); |
824 | struct regulator_dev **rdev = max8998->rdev; | 824 | struct regulator_dev **rdev = max8998->rdev; |
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c index 54f42b3d964c..c46c6705cd74 100644 --- a/drivers/regulator/mc13783-regulator.c +++ b/drivers/regulator/mc13783-regulator.c | |||
@@ -445,7 +445,7 @@ err: | |||
445 | return ret; | 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 | struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev); | 450 | struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev); |
451 | struct mc13xxx_regulator_platform_data *pdata = | 451 | struct mc13xxx_regulator_platform_data *pdata = |
diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c index 9804a313da2f..0d84b1f33199 100644 --- a/drivers/regulator/mc13892-regulator.c +++ b/drivers/regulator/mc13892-regulator.c | |||
@@ -588,7 +588,7 @@ err_unlock: | |||
588 | return ret; | 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 | struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev); | 593 | struct mc13xxx_regulator_priv *priv = platform_get_drvdata(pdev); |
594 | int i; | 594 | int i; |
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index b04774492bc0..3d445929cc80 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c | |||
@@ -868,7 +868,7 @@ err_unregister_regulator: | |||
868 | return ret; | 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 | struct palmas_pmic *pmic = platform_get_drvdata(pdev); | 873 | struct palmas_pmic *pmic = platform_get_drvdata(pdev); |
874 | int id; | 874 | int id; |
diff --git a/drivers/regulator/pcap-regulator.c b/drivers/regulator/pcap-regulator.c index 4f3e445ec854..4899342f1fc1 100644 --- a/drivers/regulator/pcap-regulator.c +++ b/drivers/regulator/pcap-regulator.c | |||
@@ -255,7 +255,7 @@ static int pcap_regulator_probe(struct platform_device *pdev) | |||
255 | return 0; | 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 | struct regulator_dev *rdev = platform_get_drvdata(pdev); | 260 | struct regulator_dev *rdev = platform_get_drvdata(pdev); |
261 | 261 | ||
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c index 51cb1bb3a2a7..d776f518aa0d 100644 --- a/drivers/regulator/pcf50633-regulator.c +++ b/drivers/regulator/pcf50633-regulator.c | |||
@@ -222,7 +222,7 @@ static int pcf50633_regulator_probe(struct platform_device *pdev) | |||
222 | return 0; | 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 | struct regulator_dev *rdev = platform_get_drvdata(pdev); | 227 | struct regulator_dev *rdev = platform_get_drvdata(pdev); |
228 | 228 | ||
diff --git a/drivers/regulator/rc5t583-regulator.c b/drivers/regulator/rc5t583-regulator.c index 7f83f3345405..9e6f78694bf1 100644 --- a/drivers/regulator/rc5t583-regulator.c +++ b/drivers/regulator/rc5t583-regulator.c | |||
@@ -198,7 +198,7 @@ clean_exit: | |||
198 | return ret; | 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 | struct rc5t583_regulator *regs = platform_get_drvdata(pdev); | 203 | struct rc5t583_regulator *regs = platform_get_drvdata(pdev); |
204 | int id; | 204 | int id; |
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index c918e99f937a..85fc086c1319 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c | |||
@@ -307,7 +307,7 @@ err: | |||
307 | return ret; | 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 | struct s2mps11_info *s2mps11 = platform_get_drvdata(pdev); | 312 | struct s2mps11_info *s2mps11 = platform_get_drvdata(pdev); |
313 | int i; | 313 | int i; |
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index 15f3ccac758c..2b822bec3c2d 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c | |||
@@ -773,7 +773,7 @@ err: | |||
773 | return ret; | 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 | struct s5m8767_info *s5m8767 = platform_get_drvdata(pdev); | 778 | struct s5m8767_info *s5m8767 = platform_get_drvdata(pdev); |
779 | struct regulator_dev **rdev = s5m8767->rdev; | 779 | struct regulator_dev **rdev = s5m8767->rdev; |
diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c index ff79a468cd99..a9c3a4a6cca0 100644 --- a/drivers/regulator/tps51632-regulator.c +++ b/drivers/regulator/tps51632-regulator.c | |||
@@ -290,7 +290,7 @@ static int tps51632_probe(struct i2c_client *client, | |||
290 | return 0; | 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 | struct tps51632_chip *tps = i2c_get_clientdata(client); | 295 | struct tps51632_chip *tps = i2c_get_clientdata(client); |
296 | 296 | ||
diff --git a/drivers/regulator/tps6105x-regulator.c b/drivers/regulator/tps6105x-regulator.c index f8c0c9273399..ec9453ffb77f 100644 --- a/drivers/regulator/tps6105x-regulator.c +++ b/drivers/regulator/tps6105x-regulator.c | |||
@@ -159,7 +159,7 @@ static int tps6105x_regulator_probe(struct platform_device *pdev) | |||
159 | return 0; | 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 | struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev); | 164 | struct tps6105x *tps6105x = dev_get_platdata(&pdev->dev); |
165 | regulator_unregister(tps6105x->regulator); | 165 | regulator_unregister(tps6105x->regulator); |
diff --git a/drivers/regulator/tps62360-regulator.c b/drivers/regulator/tps62360-regulator.c index 7fba9ffab22c..acbd63fde415 100644 --- a/drivers/regulator/tps62360-regulator.c +++ b/drivers/regulator/tps62360-regulator.c | |||
@@ -490,7 +490,7 @@ static int tps62360_probe(struct i2c_client *client, | |||
490 | * | 490 | * |
491 | * Unregister TPS driver as an i2c client device driver | 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 | struct tps62360_chip *tps = i2c_get_clientdata(client); | 495 | struct tps62360_chip *tps = i2c_get_clientdata(client); |
496 | 496 | ||
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c index a039206fd90a..9b9af6d889c8 100644 --- a/drivers/regulator/tps65023-regulator.c +++ b/drivers/regulator/tps65023-regulator.c | |||
@@ -319,7 +319,7 @@ static int tps_65023_probe(struct i2c_client *client, | |||
319 | return error; | 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 | struct tps_pmic *tps = i2c_get_clientdata(client); | 324 | struct tps_pmic *tps = i2c_get_clientdata(client); |
325 | int i; | 325 | int i; |
diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c index 6c45d5af6f93..0233cfb56560 100644 --- a/drivers/regulator/tps6507x-regulator.c +++ b/drivers/regulator/tps6507x-regulator.c | |||
@@ -439,7 +439,7 @@ fail: | |||
439 | return error; | 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 | struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev); | 444 | struct tps6507x_dev *tps6507x_dev = platform_get_drvdata(pdev); |
445 | struct tps6507x_pmic *tps = tps6507x_dev->pmic; | 445 | struct tps6507x_pmic *tps = tps6507x_dev->pmic; |
diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c index cc5be1f512a8..3974a992220f 100644 --- a/drivers/regulator/tps65090-regulator.c +++ b/drivers/regulator/tps65090-regulator.c | |||
@@ -232,7 +232,7 @@ scrub: | |||
232 | return ret; | 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 | struct tps65090_regulator *pmic = platform_get_drvdata(pdev); | 237 | struct tps65090_regulator *pmic = platform_get_drvdata(pdev); |
238 | struct tps65090_regulator *ri; | 238 | struct tps65090_regulator *ri; |
diff --git a/drivers/regulator/tps65217-regulator.c b/drivers/regulator/tps65217-regulator.c index e34fb8689091..73dce7664126 100644 --- a/drivers/regulator/tps65217-regulator.c +++ b/drivers/regulator/tps65217-regulator.c | |||
@@ -397,7 +397,7 @@ err_unregister_regulator: | |||
397 | return ret; | 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 | struct tps65217 *tps = platform_get_drvdata(pdev); | 402 | struct tps65217 *tps = platform_get_drvdata(pdev); |
403 | unsigned int i; | 403 | unsigned int i; |
diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c index 7206f4e3e760..9ce44109f2aa 100644 --- a/drivers/regulator/tps6586x-regulator.c +++ b/drivers/regulator/tps6586x-regulator.c | |||
@@ -461,7 +461,7 @@ fail: | |||
461 | return err; | 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 | struct regulator_dev **rdev = platform_get_drvdata(pdev); | 466 | struct regulator_dev **rdev = platform_get_drvdata(pdev); |
467 | int id = TPS6586X_ID_MAX_REGULATOR; | 467 | int id = TPS6586X_ID_MAX_REGULATOR; |
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 276eeb5c12ca..6b77bbf32ebc 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c | |||
@@ -1184,7 +1184,7 @@ err_unregister_regulator: | |||
1184 | return err; | 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 | struct tps65910_reg *pmic = platform_get_drvdata(pdev); | 1189 | struct tps65910_reg *pmic = platform_get_drvdata(pdev); |
1190 | int i; | 1190 | int i; |
diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c index 35b2a6fb8614..17e994e47dc1 100644 --- a/drivers/regulator/tps65912-regulator.c +++ b/drivers/regulator/tps65912-regulator.c | |||
@@ -525,7 +525,7 @@ err: | |||
525 | return err; | 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 | struct tps65912_reg *tps65912_reg = platform_get_drvdata(pdev); | 530 | struct tps65912_reg *tps65912_reg = platform_get_drvdata(pdev); |
531 | int i; | 531 | int i; |
diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c index cdfcbc9c51a3..127d1754fcd3 100644 --- a/drivers/regulator/tps80031-regulator.c +++ b/drivers/regulator/tps80031-regulator.c | |||
@@ -753,7 +753,7 @@ fail: | |||
753 | return ret; | 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 | struct tps80031_regulator *pmic = platform_get_drvdata(pdev); | 758 | struct tps80031_regulator *pmic = platform_get_drvdata(pdev); |
759 | struct tps80031_regulator *ri = NULL; | 759 | struct tps80031_regulator *ri = NULL; |
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c index 66e62a2cb244..493c8c6a241f 100644 --- a/drivers/regulator/twl-regulator.c +++ b/drivers/regulator/twl-regulator.c | |||
@@ -1241,7 +1241,7 @@ static int twlreg_probe(struct platform_device *pdev) | |||
1241 | return 0; | 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 | struct regulator_dev *rdev = platform_get_drvdata(pdev); | 1246 | struct regulator_dev *rdev = platform_get_drvdata(pdev); |
1247 | struct twlreg_info *info = rdev->reg_data; | 1247 | struct twlreg_info *info = rdev->reg_data; |
diff --git a/drivers/regulator/vexpress.c b/drivers/regulator/vexpress.c index 405620197a23..4668c7f8133d 100644 --- a/drivers/regulator/vexpress.c +++ b/drivers/regulator/vexpress.c | |||
@@ -114,7 +114,7 @@ error_kzalloc: | |||
114 | return err; | 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 | struct vexpress_regulator *reg = platform_get_drvdata(pdev); | 119 | struct vexpress_regulator *reg = platform_get_drvdata(pdev); |
120 | 120 | ||
diff --git a/drivers/regulator/virtual.c b/drivers/regulator/virtual.c index be0dd182eab9..01c66e9712a4 100644 --- a/drivers/regulator/virtual.c +++ b/drivers/regulator/virtual.c | |||
@@ -321,7 +321,7 @@ static int regulator_virtual_probe(struct platform_device *pdev) | |||
321 | return 0; | 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 | struct virtual_consumer_data *drvdata = platform_get_drvdata(pdev); | 326 | struct virtual_consumer_data *drvdata = platform_get_drvdata(pdev); |
327 | 327 | ||
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c index 54e9778f5080..33297bcce3f8 100644 --- a/drivers/regulator/wm831x-dcdc.c +++ b/drivers/regulator/wm831x-dcdc.c | |||
@@ -562,7 +562,7 @@ err: | |||
562 | return ret; | 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 | struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); | 567 | struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); |
568 | struct wm831x *wm831x = dcdc->wm831x; | 568 | struct wm831x *wm831x = dcdc->wm831x; |
@@ -710,7 +710,7 @@ err: | |||
710 | return ret; | 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 | struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); | 715 | struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); |
716 | 716 | ||
@@ -845,7 +845,7 @@ err: | |||
845 | return ret; | 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 | struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); | 850 | struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); |
851 | 851 | ||
@@ -936,7 +936,7 @@ err: | |||
936 | return ret; | 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 | struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); | 941 | struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev); |
942 | 942 | ||
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c index ac4bdffef2ea..68586ee3e1cb 100644 --- a/drivers/regulator/wm831x-isink.c +++ b/drivers/regulator/wm831x-isink.c | |||
@@ -221,7 +221,7 @@ err: | |||
221 | return ret; | 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 | struct wm831x_isink *isink = platform_get_drvdata(pdev); | 226 | struct wm831x_isink *isink = platform_get_drvdata(pdev); |
227 | 227 | ||
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c index 90f657fe24ae..1ec379a9a95c 100644 --- a/drivers/regulator/wm831x-ldo.c +++ b/drivers/regulator/wm831x-ldo.c | |||
@@ -334,7 +334,7 @@ err: | |||
334 | return ret; | 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 | struct wm831x_ldo *ldo = platform_get_drvdata(pdev); | 339 | struct wm831x_ldo *ldo = platform_get_drvdata(pdev); |
340 | 340 | ||
@@ -590,7 +590,7 @@ err: | |||
590 | return ret; | 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 | struct wm831x_ldo *ldo = platform_get_drvdata(pdev); | 595 | struct wm831x_ldo *ldo = platform_get_drvdata(pdev); |
596 | 596 | ||
@@ -737,7 +737,7 @@ err: | |||
737 | return ret; | 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 | struct wm831x_ldo *ldo = platform_get_drvdata(pdev); | 742 | struct wm831x_ldo *ldo = platform_get_drvdata(pdev); |
743 | 743 | ||
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c index c155ec3159b9..c6a32ea80b9d 100644 --- a/drivers/regulator/wm8400-regulator.c +++ b/drivers/regulator/wm8400-regulator.c | |||
@@ -246,7 +246,7 @@ static int wm8400_regulator_probe(struct platform_device *pdev) | |||
246 | return 0; | 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 | struct regulator_dev *rdev = platform_get_drvdata(pdev); | 251 | struct regulator_dev *rdev = platform_get_drvdata(pdev); |
252 | 252 | ||
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c index ea0fdd57fbbe..6ff872342648 100644 --- a/drivers/regulator/wm8994-regulator.c +++ b/drivers/regulator/wm8994-regulator.c | |||
@@ -142,7 +142,7 @@ err: | |||
142 | return ret; | 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 | struct wm8994_ldo *ldo = platform_get_drvdata(pdev); | 147 | struct wm8994_ldo *ldo = platform_get_drvdata(pdev); |
148 | 148 | ||