Merge tag 'for-v6.3-rc' · tjh.dev/kernel@12752b5

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

Merge tag 'for-v6.3-rc'

Merge the 6.3 power-supply fixes branch, which is required
for further cleanups in the rk817 driver.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

Sebastian Reichel 3 years ago 12752b5d ce38f3fc

+5 -5

5 changed files

expand all

drivers

power

supply

axp288_fuel_gauge.c

bq24190_charger.c

cros_usbpd-charger.c

da9150-charger.c

rk817_charger.c

drivers/power/supply/axp288_fuel_gauge.c

··· 724 724 725 725 for (i = 0; i < AXP288_FG_INTR_NUM; i++) { 726 726 pirq = platform_get_irq(pdev, i); 727 + if (pirq < 0) 728 + continue; 727 729 ret = regmap_irq_get_virq(axp20x->regmap_irqc, pirq); 728 730 if (ret < 0) 729 731 return dev_err_probe(dev, ret, "getting vIRQ %d\n", pirq);

drivers/power/supply/bq24190_charger.c

··· 1906 1906 struct bq24190_dev_info *bdi = i2c_get_clientdata(client); 1907 1907 int error; 1908 1908 1909 + cancel_delayed_work_sync(&bdi->input_current_limit_work); 1909 1910 error = pm_runtime_resume_and_get(bdi->dev); 1910 1911 if (error < 0) 1911 1912 dev_warn(bdi->dev, "pm_runtime_get failed: %i\n", error);

+1 -1

drivers/power/supply/cros_usbpd-charger.c

··· 276 276 port->psy_current_max = 0; 277 277 break; 278 278 default: 279 - dev_err(dev, "Port %d: default case!\n", port->port_number); 279 + dev_dbg(dev, "Port %d: default case!\n", port->port_number); 280 280 port->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP; 281 281 } 282 282

drivers/power/supply/da9150-charger.c

··· 657 657 658 658 if (!IS_ERR_OR_NULL(charger->usb_phy)) 659 659 usb_unregister_notifier(charger->usb_phy, &charger->otg_nb); 660 + cancel_work_sync(&charger->otg_work); 660 661 661 662 power_supply_unregister(charger->battery); 662 663 power_supply_unregister(charger->usb);

-4

drivers/power/supply/rk817_charger.c

··· 785 785 regmap_bulk_read(rk808->regmap, RK817_GAS_GAUGE_Q_PRES_H3, 786 786 bulk_reg, 4); 787 787 tmp = get_unaligned_be32(bulk_reg); 788 - if (tmp < 0) 789 - tmp = 0; 790 788 boot_charge_mah = ADC_TO_CHARGE_UAH(tmp, 791 789 charger->res_div) / 1000; 792 790 /* ··· 823 825 regmap_bulk_read(rk808->regmap, RK817_GAS_GAUGE_Q_PRES_H3, 824 826 bulk_reg, 4); 825 827 tmp = get_unaligned_be32(bulk_reg); 826 - if (tmp < 0) 827 - tmp = 0; 828 828 boot_charge_mah = ADC_TO_CHARGE_UAH(tmp, charger->res_div) / 1000; 829 829 regmap_bulk_read(rk808->regmap, RK817_GAS_GAUGE_OCV_VOL_H, 830 830 bulk_reg, 2);