| Message ID | 20170327145939.29824-3-benjamin.tissoires@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 27 Mar 2017, Benjamin Tissoires wrote: > From: Bastien Nocera <hadess@hadess.net> > > Without a scope defined, UPower assumes that the battery provides > power to the computer it's connected to, like a laptop battery or a UPS. > > Tested-by: Peter Hutterer <peter.hutterer@who-t.net> > Signed-off-by: Bastien Nocera <hadess@hadess.net> > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > --- > > no changes in v3 > > changes in v2: > * fixed typo in commit message > --- > drivers/hid/hid-logitech-hidpp.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c > index 4eeb550..4aaf237 100644 > --- a/drivers/hid/hid-logitech-hidpp.c > +++ b/drivers/hid/hid-logitech-hidpp.c > @@ -761,6 +761,7 @@ static int hidpp20_battery_event(struct hidpp_device *hidpp, > static enum power_supply_property hidpp_battery_props[] = { > POWER_SUPPLY_PROP_STATUS, > POWER_SUPPLY_PROP_CAPACITY, > + POWER_SUPPLY_PROP_SCOPE, This certainly assumes some other patchset to be already applied, right? Which tree is this patchset based on, please? Thanks,
On Apr 06 2017 or thereabouts, Jiri Kosina wrote: > On Mon, 27 Mar 2017, Benjamin Tissoires wrote: > > > From: Bastien Nocera <hadess@hadess.net> > > > > Without a scope defined, UPower assumes that the battery provides > > power to the computer it's connected to, like a laptop battery or a UPS. > > > > Tested-by: Peter Hutterer <peter.hutterer@who-t.net> > > Signed-off-by: Bastien Nocera <hadess@hadess.net> > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > > > --- > > > > no changes in v3 > > > > changes in v2: > > * fixed typo in commit message > > --- > > drivers/hid/hid-logitech-hidpp.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c > > index 4eeb550..4aaf237 100644 > > --- a/drivers/hid/hid-logitech-hidpp.c > > +++ b/drivers/hid/hid-logitech-hidpp.c > > @@ -761,6 +761,7 @@ static int hidpp20_battery_event(struct hidpp_device *hidpp, > > static enum power_supply_property hidpp_battery_props[] = { > > POWER_SUPPLY_PROP_STATUS, > > POWER_SUPPLY_PROP_CAPACITY, > > + POWER_SUPPLY_PROP_SCOPE, > > This certainly assumes some other patchset to be already applied, right? Hehe, once again you forgot about it, and me to make a note about it too ;-) > > Which tree is this patchset based on, please? Your for-4.8/logitech-hidpp-battery branch :) Cheers, Benjamin > > Thanks, > > -- > Jiri Kosina > SUSE Labs > -- 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, 6 Apr 2017, Benjamin Tissoires wrote: > > > Without a scope defined, UPower assumes that the battery provides > > > power to the computer it's connected to, like a laptop battery or a UPS. > > > > > > Tested-by: Peter Hutterer <peter.hutterer@who-t.net> > > > Signed-off-by: Bastien Nocera <hadess@hadess.net> > > > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > > > > > --- > > > > > > no changes in v3 > > > > > > changes in v2: > > > * fixed typo in commit message > > > --- > > > drivers/hid/hid-logitech-hidpp.c | 4 ++++ > > > 1 file changed, 4 insertions(+) > > > > > > diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c > > > index 4eeb550..4aaf237 100644 > > > --- a/drivers/hid/hid-logitech-hidpp.c > > > +++ b/drivers/hid/hid-logitech-hidpp.c > > > @@ -761,6 +761,7 @@ static int hidpp20_battery_event(struct hidpp_device *hidpp, > > > static enum power_supply_property hidpp_battery_props[] = { > > > POWER_SUPPLY_PROP_STATUS, > > > POWER_SUPPLY_PROP_CAPACITY, > > > + POWER_SUPPLY_PROP_SCOPE, > > > > This certainly assumes some other patchset to be already applied, right? > > Hehe, once again you forgot about it, and me to make a note about it > too ;-) Bah, right; I was pretty sure we've discussed this, but was not able to find in anywhere in the history :) Now queued in for-4.12/logitech-hidpp-battery-power-supply. Thanks,
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 4eeb550..4aaf237 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -761,6 +761,7 @@ static int hidpp20_battery_event(struct hidpp_device *hidpp, static enum power_supply_property hidpp_battery_props[] = { POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_CAPACITY, + POWER_SUPPLY_PROP_SCOPE, }; static int hidpp_battery_get_property(struct power_supply *psy, @@ -777,6 +778,9 @@ static int hidpp_battery_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_CAPACITY: val->intval = hidpp->battery.level; break; + case POWER_SUPPLY_PROP_SCOPE: + val->intval = POWER_SUPPLY_SCOPE_DEVICE; + break; default: ret = -EINVAL; break;