Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux

[firefly-linux-kernel-4.4.55.git] / drivers / regulator / tps6586x-regulator.c

diff --git a/drivers/regulator/tps6586x-regulator.c b/drivers/regulator/tps6586x-regulator.c
index c3e0c9730cdaafb3ce82bf62710ba245511bf488..f86da672c758b4ab1070facacdf291cabc482c66 100644 (file)
--- a/drivers/regulator/tps6586x-regulator.c
+++ b/drivers/regulator/tps6586x-regulator.c
@@ -378,7 +378,7 @@ static struct tps6586x_platform_data *tps6586x_parse_regulator_dt(
 }
 #endif
 
-static int __devinit tps6586x_regulator_probe(struct platform_device *pdev)
+static int tps6586x_regulator_probe(struct platform_device *pdev)
 {
        struct tps6586x_regulator *ri = NULL;
        struct regulator_config config = { };
@@ -461,7 +461,7 @@ fail:
        return err;
 }
 
-static int __devexit tps6586x_regulator_remove(struct platform_device *pdev)
+static int tps6586x_regulator_remove(struct platform_device *pdev)
 {
        struct regulator_dev **rdev = platform_get_drvdata(pdev);
        int id = TPS6586X_ID_MAX_REGULATOR;
@@ -478,7 +478,7 @@ static struct platform_driver tps6586x_regulator_driver = {
                .owner  = THIS_MODULE,
        },
        .probe          = tps6586x_regulator_probe,
-       .remove         = __devexit_p(tps6586x_regulator_remove),
+       .remove         = tps6586x_regulator_remove,
 };
 
 static int __init tps6586x_regulator_init(void)