Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 98bf7c057b35eaf418ac063c4aba4f9f86220b09

Authored by Dmitry Torokhov
Committed by Liam Girdwood
1 parent 4cf95663c8
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/regulator/ab3100.c
Diff comments   View file @ 98bf7c0
... ... @@ -561,7 +561,7 @@
561 561 * for all the different regulators.
562 562 */
563 563  
564   -static int __init ab3100_regulators_probe(struct platform_device *pdev)
  564 +static int __devinit ab3100_regulators_probe(struct platform_device *pdev)
565 565 {
566 566 struct ab3100_platform_data *plfdata = pdev->dev.platform_data;
567 567 struct ab3100 *ab3100 = platform_get_drvdata(pdev);
... ... @@ -641,7 +641,7 @@
641 641 return 0;
642 642 }
643 643  
644   -static int __exit ab3100_regulators_remove(struct platform_device *pdev)
  644 +static int __devexit ab3100_regulators_remove(struct platform_device *pdev)
645 645 {
646 646 int i;
647 647  
... ... @@ -659,7 +659,7 @@
659 659 .owner = THIS_MODULE,
660 660 },
661 661 .probe = ab3100_regulators_probe,
662   - .remove = __exit_p(ab3100_regulators_remove),
  662 + .remove = __devexit_p(ab3100_regulators_remove),
663 663 };
664 664  
665 665 static __init int ab3100_regulators_init(void)