Merge remote-tracking branch 'regulator/topic/hotplug' into regulator-next

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c
index 739faf99b9e2..ed7beec53af8 100644
--- a/drivers/regulator/arizona-ldo1.c
+++ b/drivers/regulator/arizona-ldo1.c
@@ -180,7 +180,7 @@ static const struct regulator_init_data arizona_ldo1_default = {
         .num_consumer_supplies = 1,
 };
 
-static __devinit int arizona_ldo1_probe(struct platform_device *pdev)
+static int arizona_ldo1_probe(struct platform_device *pdev)
 {
         struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
         const struct regulator_desc *desc;
@@ -239,7 +239,7 @@ static __devinit int arizona_ldo1_probe(struct platform_device *pdev)
         return 0;
 }
 
-static __devexit int arizona_ldo1_remove(struct platform_device *pdev)
+static int arizona_ldo1_remove(struct platform_device *pdev)
 {
         struct arizona_ldo1 *ldo1 = platform_get_drvdata(pdev);
 
@@ -250,7 +250,7 @@ static __devexit int arizona_ldo1_remove(struct platform_device *pdev)
 
 static struct platform_driver arizona_ldo1_driver = {
         .probe = arizona_ldo1_probe,
-        .remove = __devexit_p(arizona_ldo1_remove),
+        .remove = arizona_ldo1_remove,
         .driver         = {
                 .name   = "arizona-ldo1",
                 .owner  = THIS_MODULE,