aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-02-24 02:37:50 -0500
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-03-03 09:49:27 -0500
commit98bf7c057b35eaf418ac063c4aba4f9f86220b09 (patch)
tree2513879c8a4cb53267bb92e2be362ca244667bc1
parent4cf95663c829ddd47c76ba5b749e88864beef0a7 (diff)
Regulators: ab3100 - fix probe and remove annotations
Probe and remove methods should not be marked as __init/__exit but rather __devinit/__devexit so that the needed sections stay in memory in presence of CONFIG_HOTPLUG. This is needed even on non hotpluggable buses. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r--drivers/regulator/ab3100.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index b349db4504b7..7de950959ed2 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -561,7 +561,7 @@ ab3100_regulator_desc[AB3100_NUM_REGULATORS] = {
561 * for all the different regulators. 561 * for all the different regulators.
562 */ 562 */
563 563
564static int __init ab3100_regulators_probe(struct platform_device *pdev) 564static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
565{ 565{
566 struct ab3100_platform_data *plfdata = pdev->dev.platform_data; 566 struct ab3100_platform_data *plfdata = pdev->dev.platform_data;
567 struct ab3100 *ab3100 = platform_get_drvdata(pdev); 567 struct ab3100 *ab3100 = platform_get_drvdata(pdev);
@@ -641,7 +641,7 @@ static int __init ab3100_regulators_probe(struct platform_device *pdev)
641 return 0; 641 return 0;
642} 642}
643 643
644static int __exit ab3100_regulators_remove(struct platform_device *pdev) 644static int __devexit ab3100_regulators_remove(struct platform_device *pdev)
645{ 645{
646 int i; 646 int i;
647 647
@@ -659,7 +659,7 @@ static struct platform_driver ab3100_regulators_driver = {
659 .owner = THIS_MODULE, 659 .owner = THIS_MODULE,
660 }, 660 },
661 .probe = ab3100_regulators_probe, 661 .probe = ab3100_regulators_probe,
662 .remove = __exit_p(ab3100_regulators_remove), 662 .remove = __devexit_p(ab3100_regulators_remove),
663}; 663};
664 664
665static __init int ab3100_regulators_init(void) 665static __init int ab3100_regulators_init(void)