The patch titled power_supply: add support for WM8350 PMU (update) has been removed from the -mm tree. Its filename was power_supply-add-support-for-wm8350-pmu-update.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: power_supply: add support for WM8350 PMU (update) From: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx> Modified to: - Notify core of status changes in the battery charger. - Remove the WM8350-specific supply state sysfs file. following feedback from Andrew. Cc: Anton Vorontsov <cbouatmailru@xxxxxxxxx> Cc: Samuel Ortiz <sameo@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/power/wm8350_power.c | 38 +-------------------------------- 1 file changed, 2 insertions(+), 36 deletions(-) diff -puN drivers/power/wm8350_power.c~power_supply-add-support-for-wm8350-pmu-update drivers/power/wm8350_power.c --- a/drivers/power/wm8350_power.c~power_supply-add-support-for-wm8350-pmu-update +++ a/drivers/power/wm8350_power.c @@ -156,36 +156,6 @@ static int wm8350_batt_status(struct wm8 } } -static ssize_t supply_state_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct wm8350 *wm8350 = dev_get_drvdata(dev); - char *supply; - int state; - - state = wm8350_get_supplies(wm8350); - switch (state) { - case WM8350_BATT_SUPPLY: - supply = "Battery"; - break; - case WM8350_USB_SUPPLY: - supply = "USB"; - break; - case WM8350_LINE_SUPPLY: - supply = "Line"; - break; - case WM8350_USB_SUPPLY | WM8350_BATT_SUPPLY: - supply = "Battery and USB"; - break; - default: - return 0; - } - - return sprintf(buf, "%s\n", supply); -} - -static DEVICE_ATTR(supply_state, 0444, supply_state_show, NULL); - static ssize_t charger_state_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -233,10 +203,10 @@ static void wm8350_charger_handler(struc dev_err(wm8350->dev, "charger timeout\n"); break; case WM8350_IRQ_CHG_END: - dev_dbg(wm8350->dev, "charger stopped\n"); + power_supply_changed(&power->battery); break; case WM8350_IRQ_CHG_START: - dev_dbg(wm8350->dev, "charger started\n"); + power_supply_changed(&power->battery); break; case WM8350_IRQ_CHG_FAST_RDY: @@ -485,9 +455,6 @@ static __devinit int wm8350_power_probe( if (ret) goto usb_failed; - ret = device_create_file(&pdev->dev, &dev_attr_supply_state); - if (ret < 0) - dev_warn(wm8350->dev, "failed to add supply sysfs: %d\n", ret); ret = device_create_file(&pdev->dev, &dev_attr_charger_state); if (ret < 0) dev_warn(wm8350->dev, "failed to add charge sysfs: %d\n", ret); @@ -516,7 +483,6 @@ static __devexit int wm8350_power_remove struct wm8350_power *power = &wm8350->power; free_charger_irq(wm8350); - device_remove_file(&pdev->dev, &dev_attr_supply_state); device_remove_file(&pdev->dev, &dev_attr_charger_state); power_supply_unregister(&power->battery); power_supply_unregister(&power->ac); _ Patches currently in -mm which might be from broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx are linux-next.patch leds-add-wm8350-led-driver.patch leds-add-wm8350-led-driver-fix.patch mfd-correct-wm8350-i2c-return-code-usage.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html