diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-16 00:37:15 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-16 00:37:15 +0300 |
| commit | 19b9aaf8a5fa634b2f16c3a2cfa819b74991273e (patch) | |
| tree | 622f9cd78f6bafdd1460aa4b26217d02c01dd9b1 /drivers/power/supply/pcf50633-charger.c | |
| parent | 6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f (diff) | |
| parent | 838c8afa67f98014970c9f56107805e767ed87ad (diff) | |
| download | linux-19b9aaf8a5fa634b2f16c3a2cfa819b74991273e.tar.xz | |
Merge tag 'for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
- misc minor fixes
* tag 'for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power: supply: cpcap-charger: fix incorrect return value check
power: supply: replace pr_* with dev_*
power: supply: pcf50633-charger: remove redundant variable charging_start
power: supply: generic-adc-battery: remove redundant variable pdata
power: supply: max8997: Improve a size determination in probe
Diffstat (limited to 'drivers/power/supply/pcf50633-charger.c')
| -rw-r--r-- | drivers/power/supply/pcf50633-charger.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/power/supply/pcf50633-charger.c b/drivers/power/supply/pcf50633-charger.c index 1ad7ccce6075..1aba14046a83 100644 --- a/drivers/power/supply/pcf50633-charger.c +++ b/drivers/power/supply/pcf50633-charger.c @@ -43,7 +43,6 @@ int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma) struct pcf50633_mbc *mbc = platform_get_drvdata(pcf->mbc_pdev); int ret = 0; u8 bits; - int charging_start = 1; u8 mbcs2, chgmod; unsigned int mbcc5; @@ -58,7 +57,6 @@ int pcf50633_mbc_usb_curlim_set(struct pcf50633 *pcf, int ma) ma = 100; } else { bits = PCF50633_MBCC7_USB_SUSPEND; - charging_start = 0; ma = 0; } |