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

[can-eth-gw-linux.git] / drivers / regulator / tps80031-regulator.c

diff --git a/drivers/regulator/tps80031-regulator.c b/drivers/regulator/tps80031-regulator.c
index b54300c644242eed74b0b313804a760a369e16b5..b15d711bc8c66634c9792c26e15885e055aabe11 100644 (file)
--- a/drivers/regulator/tps80031-regulator.c
+++ b/drivers/regulator/tps80031-regulator.c
@@ -672,7 +672,7 @@ static int check_smps_mode_mult(struct device *parent,
        return 0;
 }
 
-static int __devinit tps80031_regulator_probe(struct platform_device *pdev)
+static int tps80031_regulator_probe(struct platform_device *pdev)
 {
        struct tps80031_platform_data *pdata;
        struct tps80031_regulator_platform_data *tps_pdata;
@@ -748,7 +748,7 @@ fail:
        return ret;
 }
 
-static int __devexit tps80031_regulator_remove(struct platform_device *pdev)
+static int tps80031_regulator_remove(struct platform_device *pdev)
 {
        struct tps80031_regulator *pmic = platform_get_drvdata(pdev);
        struct tps80031_regulator *ri = NULL;
@@ -767,7 +767,7 @@ static struct platform_driver tps80031_regulator_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = tps80031_regulator_probe,
-       .remove         = __devexit_p(tps80031_regulator_remove),
+       .remove         = tps80031_regulator_remove,
 };
 
 static int __init tps80031_regulator_init(void)