diff options
| author | Graeme Gregory <gg@slimlogic.co.uk> | 2012-02-16 16:02:09 +0000 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 13:00:24 +0200 |
| commit | 2056a0963bbae2d23129374fd9306ca8def74c8a (patch) | |
| tree | 80db3fffb0156aafec1af52cd440aa31c9c7da03 /drivers/power | |
| parent | 9dba284e7e22705ca9e4c1b53fc8a49c8dcec970 (diff) | |
| download | kernel_samsung_tuna-2056a0963bbae2d23129374fd9306ca8def74c8a.zip kernel_samsung_tuna-2056a0963bbae2d23129374fd9306ca8def74c8a.tar.gz kernel_samsung_tuna-2056a0963bbae2d23129374fd9306ca8def74c8a.tar.bz2 | |
twl6030_bci_battery remove use_eeprom_config
In all sensible use cases use_eeprom_config and use_hw_charger are
actually synonymous so simplify the code and remove the use_eeprom_config.
Change-Id: Ibf473ea8106a72038f646e9163665caa91de9e06
Signed-off-by: Graeme Gregory <gg@slimlogic.co.uk>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/twl6030_bci_battery.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/power/twl6030_bci_battery.c b/drivers/power/twl6030_bci_battery.c index 6d596fc..ce04e15 100644 --- a/drivers/power/twl6030_bci_battery.c +++ b/drivers/power/twl6030_bci_battery.c @@ -638,10 +638,6 @@ static void twl6030_start_usb_charger(struct twl6030_bci_device_info *di) return; } - if ((di->features & TWL6032_SUBCLASS) && - di->platform_data->use_eeprom_config) - goto enable; - dev_dbg(di->dev, "USB input current limit %dmA\n", di->charger_incurrentmA); if (di->charger_incurrentmA < 50) { @@ -658,7 +654,6 @@ static void twl6030_start_usb_charger(struct twl6030_bci_device_info *di) twl6030_config_voreg_reg(di, di->platform_data->max_bat_voltagemV); twl6030_config_iterm_reg(di, di->platform_data->termination_currentmA); -enable: if (di->charger_incurrentmA >= 50) { reg = CONTROLLER_CTRL1_EN_CHARGER; @@ -2493,7 +2488,7 @@ static int __devinit twl6030_bci_battery_probe(struct platform_device *pdev) di->features = pdata->features; di->errata = pdata->errata; - if (pdata->use_eeprom_config && + if (pdata->use_hw_charger && di->features & TWL6032_SUBCLASS) { di->platform_data->max_charger_currentmA = twl6030_get_limit2_reg(di); @@ -2644,7 +2639,7 @@ static int __devinit twl6030_bci_battery_probe(struct platform_device *pdev) dev_dbg(&pdev->dev, "current measurement setup failed\n"); /* initialize for USB charging */ - if (!pdata->use_eeprom_config) { + if (!pdata->use_hw_charger) { twl6030_config_limit1_reg(di, pdata->max_charger_voltagemV); twl6030_config_limit2_reg(di, di->platform_data->max_charger_currentmA); |