Merge remote-tracking branch 'regulator/topic/wm831x' into regulator-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 10 Dec 2012 03:43:33 +0000 (12:43 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 10 Dec 2012 03:43:33 +0000 (12:43 +0900)
1  2 
drivers/regulator/wm831x-dcdc.c

index bce25658e12eed041634ec513aab391636b47b83,26802608a29ce20440169f8e0a32d268e05372de..0af6898bcd79b4e2739ffaa4282f8b1aea6fee70
@@@ -223,7 -223,7 +223,7 @@@ static int wm831x_buckv_map_voltage(str
        if (min_uV < 600000)
                vsel = 0;
        else if (min_uV <= 1800000)
-               vsel = ((min_uV - 600000) / 12500) + 8;
+               vsel = DIV_ROUND_UP(min_uV - 600000, 12500) + 8;
        else
                return -EINVAL;
  
@@@ -290,7 -290,7 +290,7 @@@ static int wm831x_buckv_set_voltage_sel
        if (vsel > dcdc->dvs_vsel) {
                ret = wm831x_set_bits(wm831x, dvs_reg,
                                      WM831X_DC1_DVS_VSEL_MASK,
 -                                    dcdc->dvs_vsel);
 +                                    vsel);
                if (ret == 0)
                        dcdc->dvs_vsel = vsel;
                else
@@@ -387,7 -387,7 +387,7 @@@ static struct regulator_ops wm831x_buck
   * Set up DVS control.  We just log errors since we can still run
   * (with reduced performance) if we fail.
   */
 -static __devinit void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc,
 +static void wm831x_buckv_dvs_init(struct wm831x_dcdc *dcdc,
                                            struct wm831x_buckv_pdata *pdata)
  {
        struct wm831x *wm831x = dcdc->wm831x;
        }
  }
  
 -static __devinit int wm831x_buckv_probe(struct platform_device *pdev)
 +static int wm831x_buckv_probe(struct platform_device *pdev)
  {
        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
        struct wm831x_pdata *pdata = wm831x->dev->platform_data;
@@@ -562,7 -562,7 +562,7 @@@ err
        return ret;
  }
  
 -static __devexit int wm831x_buckv_remove(struct platform_device *pdev)
 +static int wm831x_buckv_remove(struct platform_device *pdev)
  {
        struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
        struct wm831x *wm831x = dcdc->wm831x;
  
  static struct platform_driver wm831x_buckv_driver = {
        .probe = wm831x_buckv_probe,
 -      .remove = __devexit_p(wm831x_buckv_remove),
 +      .remove = wm831x_buckv_remove,
        .driver         = {
                .name   = "wm831x-buckv",
                .owner  = THIS_MODULE,
@@@ -623,7 -623,7 +623,7 @@@ static struct regulator_ops wm831x_buck
        .set_suspend_mode = wm831x_dcdc_set_suspend_mode,
  };
  
 -static __devinit int wm831x_buckp_probe(struct platform_device *pdev)
 +static int wm831x_buckp_probe(struct platform_device *pdev)
  {
        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
        struct wm831x_pdata *pdata = wm831x->dev->platform_data;
@@@ -710,7 -710,7 +710,7 @@@ err
        return ret;
  }
  
 -static __devexit int wm831x_buckp_remove(struct platform_device *pdev)
 +static int wm831x_buckp_remove(struct platform_device *pdev)
  {
        struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
  
  
  static struct platform_driver wm831x_buckp_driver = {
        .probe = wm831x_buckp_probe,
 -      .remove = __devexit_p(wm831x_buckp_remove),
 +      .remove = wm831x_buckp_remove,
        .driver         = {
                .name   = "wm831x-buckp",
                .owner  = THIS_MODULE,
@@@ -771,7 -771,7 +771,7 @@@ static struct regulator_ops wm831x_boos
        .disable = regulator_disable_regmap,
  };
  
 -static __devinit int wm831x_boostp_probe(struct platform_device *pdev)
 +static int wm831x_boostp_probe(struct platform_device *pdev)
  {
        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
        struct wm831x_pdata *pdata = wm831x->dev->platform_data;
@@@ -845,7 -845,7 +845,7 @@@ err
        return ret;
  }
  
 -static __devexit int wm831x_boostp_remove(struct platform_device *pdev)
 +static int wm831x_boostp_remove(struct platform_device *pdev)
  {
        struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
  
  
  static struct platform_driver wm831x_boostp_driver = {
        .probe = wm831x_boostp_probe,
 -      .remove = __devexit_p(wm831x_boostp_remove),
 +      .remove = wm831x_boostp_remove,
        .driver         = {
                .name   = "wm831x-boostp",
                .owner  = THIS_MODULE,
@@@ -883,7 -883,7 +883,7 @@@ static struct regulator_ops wm831x_epe_
        .get_status = wm831x_dcdc_get_status,
  };
  
 -static __devinit int wm831x_epe_probe(struct platform_device *pdev)
 +static int wm831x_epe_probe(struct platform_device *pdev)
  {
        struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
        struct wm831x_pdata *pdata = wm831x->dev->platform_data;
@@@ -936,7 -936,7 +936,7 @@@ err
        return ret;
  }
  
 -static __devexit int wm831x_epe_remove(struct platform_device *pdev)
 +static int wm831x_epe_remove(struct platform_device *pdev)
  {
        struct wm831x_dcdc *dcdc = platform_get_drvdata(pdev);
  
  
  static struct platform_driver wm831x_epe_driver = {
        .probe = wm831x_epe_probe,
 -      .remove = __devexit_p(wm831x_epe_remove),
 +      .remove = wm831x_epe_remove,
        .driver         = {
                .name   = "wm831x-epe",
                .owner  = THIS_MODULE,
@@@ -993,4 -993,5 +993,5 @@@ MODULE_DESCRIPTION("WM831x DC-DC conver
  MODULE_LICENSE("GPL");
  MODULE_ALIAS("platform:wm831x-buckv");
  MODULE_ALIAS("platform:wm831x-buckp");
+ MODULE_ALIAS("platform:wm831x-boostp");
  MODULE_ALIAS("platform:wm831x-epe");