Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney...

[platform/kernel/linux-starfive.git] / drivers / regulator / arizona-micsupp.c

diff --git a/drivers/regulator/arizona-micsupp.c b/drivers/regulator/arizona-micsupp.c
index d9b1f82..a6d040c 100644 (file)
--- a/drivers/regulator/arizona-micsupp.c
+++ b/drivers/regulator/arizona-micsupp.c
@@ -101,6 +101,8 @@ static const struct regulator_desc arizona_micsupp = {
        .bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1,
        .bypass_mask = ARIZONA_CPMIC_BYPASS,
 
        .bypass_reg = ARIZONA_MIC_CHARGE_PUMP_1,
        .bypass_mask = ARIZONA_CPMIC_BYPASS,
 

+       .enable_time = 3000,
+

        .owner = THIS_MODULE,
 };
 
        .owner = THIS_MODULE,
 };
 


@@ -115,7 +117,7 @@ static const struct regulator_init_data arizona_micsupp_default = {
        .num_consumer_supplies = 1,
 };
 
        .num_consumer_supplies = 1,
 };
 

-static __devinit int arizona_micsupp_probe(struct platform_device *pdev)
+static int arizona_micsupp_probe(struct platform_device *pdev)

 {
        struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
        struct regulator_config config = { };
 {
        struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
        struct regulator_config config = { };


@@ -166,7 +168,7 @@ static __devinit int arizona_micsupp_probe(struct platform_device *pdev)
        return 0;
 }
 
        return 0;
 }
 

-static __devexit int arizona_micsupp_remove(struct platform_device *pdev)
+static int arizona_micsupp_remove(struct platform_device *pdev)

 {
        struct arizona_micsupp *micsupp = platform_get_drvdata(pdev);
 
 {
        struct arizona_micsupp *micsupp = platform_get_drvdata(pdev);
 


@@ -177,7 +179,7 @@ static __devexit int arizona_micsupp_remove(struct platform_device *pdev)
 
 static struct platform_driver arizona_micsupp_driver = {
        .probe = arizona_micsupp_probe,
 
 static struct platform_driver arizona_micsupp_driver = {
        .probe = arizona_micsupp_probe,

-       .remove = __devexit_p(arizona_micsupp_remove),
+       .remove = arizona_micsupp_remove,

        .driver         = {
                .name   = "arizona-micsupp",
                .owner  = THIS_MODULE,
        .driver         = {
                .name   = "arizona-micsupp",
                .owner  = THIS_MODULE,