On Thu, 12 Mar 2015, Krzysztof Kozlowski wrote: > Replace direct calls to power supply function attributes with wrappers. > Wrappers provide safe access in case of unregistering the power > supply (e.g. by removing the driver). Replace: > - get_property -> power_supply_get_property > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx> > Acked-by: Jonghwa Lee <jonghwa3.lee@xxxxxxxxxxx> > Acked-by: Pavel Machek <pavel@xxxxxx> > Acked-by: Lee Jones <lee.jones@xxxxxxxxxx> > Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx> > Reviewed-by: Sebastian Reichel <sre@xxxxxxxxxx> > --- > drivers/mfd/ab8500-sysctrl.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) Has the infrastructure for these been merged yet? I.e. Can I just take them? > diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c > index cfff0b643f1b..d4a4b24be7c6 100644 > --- a/drivers/mfd/ab8500-sysctrl.c > +++ b/drivers/mfd/ab8500-sysctrl.c > @@ -49,7 +49,8 @@ static void ab8500_power_off(void) > if (!psy) > continue; > > - ret = psy->get_property(psy, POWER_SUPPLY_PROP_ONLINE, &val); > + ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_ONLINE, > + &val); > > if (!ret && val.intval) { > charger_present = true; > @@ -63,8 +64,8 @@ static void ab8500_power_off(void) > /* Check if battery is known */ > psy = power_supply_get_by_name("ab8500_btemp"); > if (psy) { > - ret = psy->get_property(psy, POWER_SUPPLY_PROP_TECHNOLOGY, > - &val); > + ret = power_supply_get_property(psy, > + POWER_SUPPLY_PROP_TECHNOLOGY, &val); > if (!ret && val.intval != POWER_SUPPLY_TECHNOLOGY_UNKNOWN) { > printk(KERN_INFO > "Charger \"%s\" is connected with known battery." -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html