| Message ID | 1426146260-30081-10-git-send-email-k.kozlowski@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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@samsung.com> > Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com> > Acked-by: Pavel Machek <pavel@ucw.cz> > Acked-by: Lee Jones <lee.jones@linaro.org> > Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > Reviewed-by: Sebastian Reichel <sre@kernel.org> > --- > 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."
On czw, 2015-03-12 at 09:01 +0000, Lee Jones wrote: > 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@samsung.com> > > Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com> > > Acked-by: Pavel Machek <pavel@ucw.cz> > > Acked-by: Lee Jones <lee.jones@linaro.org> > > Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > Reviewed-by: Sebastian Reichel <sre@kernel.org> > > --- > > 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? Previous patches were not merged yet so you cannot take it. This whole patchset can be applied incrementally but cherry picking won't work. Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 12 Mar 2015, Krzysztof Kozlowski wrote: > On czw, 2015-03-12 at 09:01 +0000, Lee Jones wrote: > > 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@samsung.com> > > > Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com> > > > Acked-by: Pavel Machek <pavel@ucw.cz> > > > Acked-by: Lee Jones <lee.jones@linaro.org> > > > Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > > Reviewed-by: Sebastian Reichel <sre@kernel.org> > > > --- > > > 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? > > Previous patches were not merged yet so you cannot take it. This whole > patchset can be applied incrementally but cherry picking won't work. So I only usually receive patches I've already Acked when a) the bulk of the set has been merged and I can apply the remaining lingerers, or b) the whole set is due to be applied through the MFD tree. Receiving 2 patches of a 22 patch set, which I have already Acked and that I can't pick is unwelcome noise.
On czw, 2015-03-12 at 09:50 +0000, Lee Jones wrote: > On Thu, 12 Mar 2015, Krzysztof Kozlowski wrote: > > On czw, 2015-03-12 at 09:01 +0000, Lee Jones wrote: > > > 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@samsung.com> > > > > Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com> > > > > Acked-by: Pavel Machek <pavel@ucw.cz> > > > > Acked-by: Lee Jones <lee.jones@linaro.org> > > > > Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > > > Reviewed-by: Sebastian Reichel <sre@kernel.org> > > > > --- > > > > 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? > > > > Previous patches were not merged yet so you cannot take it. This whole > > patchset can be applied incrementally but cherry picking won't work. > > So I only usually receive patches I've already Acked when a) the bulk > of the set has been merged and I can apply the remaining lingerers, or > b) the whole set is due to be applied through the MFD tree. > > Receiving 2 patches of a 22 patch set, which I have already Acked and > that I can't pick is unwelcome noise. Sorry for the noise, it should not happen. That is strange, how did you receive this patch? I resent this only to certain recipients because previous mail got lost in spam filters (too many recipients). I did not put other maintainers (like you) this time on cc-list. git-send-email also did not cc-ed you (your email is not listed in send-email log). How this email managed to get to you? :) Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Thu, 12 Mar 2015, Krzysztof Kozlowski wrote: > On czw, 2015-03-12 at 09:50 +0000, Lee Jones wrote: > > On Thu, 12 Mar 2015, Krzysztof Kozlowski wrote: > > > On czw, 2015-03-12 at 09:01 +0000, Lee Jones wrote: > > > > 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@samsung.com> > > > > > Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com> > > > > > Acked-by: Pavel Machek <pavel@ucw.cz> > > > > > Acked-by: Lee Jones <lee.jones@linaro.org> > > > > > Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > > > > Reviewed-by: Sebastian Reichel <sre@kernel.org> > > > > > --- > > > > > 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? > > > > > > Previous patches were not merged yet so you cannot take it. This whole > > > patchset can be applied incrementally but cherry picking won't work. > > > > So I only usually receive patches I've already Acked when a) the bulk > > of the set has been merged and I can apply the remaining lingerers, or > > b) the whole set is due to be applied through the MFD tree. > > > > Receiving 2 patches of a 22 patch set, which I have already Acked and > > that I can't pick is unwelcome noise. > > Sorry for the noise, it should not happen. > > That is strange, how did you receive this patch? I resent this only to > certain recipients because previous mail got lost in spam filters (too > many recipients). > > I did not put other maintainers (like you) this time on cc-list. > git-send-email also did not cc-ed you (your email is not listed in > send-email log). > > How this email managed to get to you? :) That's a good question. It just arrived in my Inbox. Anyway, not to worry. Let me know when the other patches have been merged, so I can apply these.
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."