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

diff --combined drivers/regulator/tps65090-regulator.c
index 3974a992220f2c963f824d907d6ba0f44aaac799,1ef8eb6e60c4817b1cd3f3eae4072c8c44763fc3..41c391789c9790a59678dc1232bf0938e978a47e
--- 1/drivers/regulator/tps65090-regulator.c
--- 2/drivers/regulator/tps65090-regulator.c
+++ b/drivers/regulator/tps65090-regulator.c
@@@ -83,7 -83,7 +83,7 @@@ static inline bool is_dcdc(int id
        }
  }
  
 -static int __devinit tps65090_config_ext_control(
 +static int tps65090_config_ext_control(
        struct tps65090_regulator *ri, bool enable)
  {
        int ret;
@@@ -99,7 -99,7 +99,7 @@@
        return ret;
  }
  
 -static int __devinit tps65090_regulator_disable_ext_control(
 +static int tps65090_regulator_disable_ext_control(
                struct tps65090_regulator *ri,
                struct tps65090_regulator_plat_data *tps_pdata)
  {
@@@ -122,7 -122,7 +122,7 @@@
        return tps65090_config_ext_control(ri, false);
  }
  
 -static void __devinit tps65090_configure_regulator_config(
 +static void tps65090_configure_regulator_config(
                struct tps65090_regulator_plat_data *tps_pdata,
                struct regulator_config *config)
  {
@@@ -138,7 -138,7 +138,7 @@@
        }
  }
  
 -static int __devinit tps65090_regulator_probe(struct platform_device *pdev)
 +static int tps65090_regulator_probe(struct platform_device *pdev)
  {
        struct tps65090 *tps65090_mfd = dev_get_drvdata(pdev->dev.parent);
        struct tps65090_regulator *ri = NULL;
@@@ -232,7 -232,7 +232,7 @@@ scrub
        return ret;
  }
  
 -static int __devexit tps65090_regulator_remove(struct platform_device *pdev)
 +static int tps65090_regulator_remove(struct platform_device *pdev)
  {
        struct tps65090_regulator *pmic = platform_get_drvdata(pdev);
        struct tps65090_regulator *ri;
@@@ -251,7 -251,7 +251,7 @@@ static struct platform_driver tps65090_
                .owner  = THIS_MODULE,
        },
        .probe          = tps65090_regulator_probe,
 -      .remove         = __devexit_p(tps65090_regulator_remove),
 +      .remove         = tps65090_regulator_remove,
  };
  
  static int __init tps65090_regulator_init(void)
@@@ -269,3 -269,4 +269,4 @@@ module_exit(tps65090_regulator_exit)
  MODULE_DESCRIPTION("tps65090 regulator driver");
  MODULE_AUTHOR("Venu Byravarasu <vbyravarasu@nvidia.com>");
  MODULE_LICENSE("GPL v2");
+ MODULE_ALIAS("platform:tps65090-pmic");