diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 13:37:15 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-15 13:37:15 -0800 |
commit | 19b9aaf8a5fa634b2f16c3a2cfa819b74991273e (patch) | |
tree | 622f9cd78f6bafdd1460aa4b26217d02c01dd9b1 | |
parent | 6c4ba00c40d5acb17f32d4b7e02dbcd21f336d9f (diff) | |
parent | 838c8afa67f98014970c9f56107805e767ed87ad (diff) | |
download | linux-19b9aaf8a5fa634b2f16c3a2cfa819b74991273e.tar.bz2 |
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
-rw-r--r-- | drivers/power/supply/cpcap-charger.c | 2 | ||||
-rw-r--r-- | drivers/power/supply/generic-adc-battery.c | 2 | ||||
-rw-r--r-- | drivers/power/supply/max8997_charger.c | 3 | ||||
-rw-r--r-- | drivers/power/supply/pcf50633-charger.c | 2 | ||||
-rw-r--r-- | drivers/power/supply/power_supply_core.c | 2 | ||||
-rw-r--r-- | drivers/power/supply/twl4030_charger.c | 2 |
6 files changed, 4 insertions, 9 deletions
diff --git a/drivers/power/supply/cpcap-charger.c b/drivers/power/supply/cpcap-charger.c index 11a07633de6c..e4905bef2663 100644 --- a/drivers/power/supply/cpcap-charger.c +++ b/drivers/power/supply/cpcap-charger.c @@ -484,7 +484,7 @@ static int cpcap_usb_init_irq(struct platform_device *pdev, int irq, error; irq = platform_get_irq_byname(pdev, name); - if (!irq) + if (irq < 0) return -ENODEV; error = devm_request_threaded_irq(ddata->dev, irq, NULL, diff --git a/drivers/power/supply/generic-adc-battery.c b/drivers/power/supply/generic-adc-battery.c index 37e523374fe0..28dc056eaafa 100644 --- a/drivers/power/supply/generic-adc-battery.c +++ b/drivers/power/supply/generic-adc-battery.c @@ -201,14 +201,12 @@ err: static void gab_work(struct work_struct *work) { struct gab *adc_bat; - struct gab_platform_data *pdata; struct delayed_work *delayed_work; bool is_plugged; int status; delayed_work = to_delayed_work(work); adc_bat = container_of(delayed_work, struct gab, bat_work); - pdata = adc_bat->pdata; status = adc_bat->status; is_plugged = power_supply_am_i_supplied(adc_bat->psy); diff --git a/drivers/power/supply/max8997_charger.c b/drivers/power/supply/max8997_charger.c index fa861003fece..c73fb4221695 100644 --- a/drivers/power/supply/max8997_charger.c +++ b/drivers/power/supply/max8997_charger.c @@ -146,8 +146,7 @@ static int max8997_battery_probe(struct platform_device *pdev) return ret; } - charger = devm_kzalloc(&pdev->dev, sizeof(struct charger_data), - GFP_KERNEL); + charger = devm_kzalloc(&pdev->dev, sizeof(*charger), GFP_KERNEL); if (!charger) return -ENOMEM; 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; } diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 02c6340ae36f..82f998ab5a52 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -669,7 +669,7 @@ EXPORT_SYMBOL_GPL(power_supply_powers); static void power_supply_dev_release(struct device *dev) { struct power_supply *psy = container_of(dev, struct power_supply, dev); - pr_debug("device: '%s': %s\n", dev_name(dev), __func__); + dev_dbg(dev, "%s\n", __func__); kfree(psy); } diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c index a5915f498eea..bbcaee56db9d 100644 --- a/drivers/power/supply/twl4030_charger.c +++ b/drivers/power/supply/twl4030_charger.c @@ -743,7 +743,7 @@ static int twl4030bci_state(struct twl4030_bci *bci) ret = twl4030_bci_read(TWL4030_BCIMSTATEC, &state); if (ret) { - pr_err("twl4030_bci: error reading BCIMSTATEC\n"); + dev_err(bci->dev, "error reading BCIMSTATEC\n"); return ret; } |