diff options
| author |   Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2017-03-27 16:59:30 +0200 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2017-04-06 14:36:38 +0200 |
| commit | 32043d0fdf9c5ef246e92f59c98624ed135b9e4e (patch) | |
| tree | 4f5b6feb85c626420ac6b33fef3c1dcebe49dbbd /drivers/hid | |
| parent | HID: logitech-hidpp: handle battery events in hidpp_raw_hidpp_event() (diff) | |
| download | linux-dev-32043d0fdf9c5ef246e92f59c98624ed135b9e4e.tar.xz linux-dev-32043d0fdf9c5ef246e92f59c98624ed135b9e4e.zip | |
HID: logitech-hidpp: forward device info in power_supply
Better forwarding the device name, manufacturer and serial to upower.
Note that serial is still empty, it will be filled in a later patch
in this series.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: Bastien Nocera <hadess@hadess.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-logitech-hidpp.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 3e2f716b446d..421c3740abcd 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -813,6 +813,9 @@ static enum power_supply_property hidpp_battery_props[] = { POWER_SUPPLY_PROP_STATUS, POWER_SUPPLY_PROP_CAPACITY, POWER_SUPPLY_PROP_SCOPE, + POWER_SUPPLY_PROP_MODEL_NAME, + POWER_SUPPLY_PROP_MANUFACTURER, + POWER_SUPPLY_PROP_SERIAL_NUMBER, }; static int hidpp_battery_get_property(struct power_supply *psy, @@ -832,6 +835,18 @@ static int hidpp_battery_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_SCOPE: val->intval = POWER_SUPPLY_SCOPE_DEVICE; break; + case POWER_SUPPLY_PROP_MODEL_NAME: + if (!strncmp(hidpp->name, "Logitech ", 9)) + val->strval = hidpp->name + 9; + else + val->strval = hidpp->name; + break; + case POWER_SUPPLY_PROP_MANUFACTURER: + val->strval = "Logitech"; + break; + case POWER_SUPPLY_PROP_SERIAL_NUMBER: + val->strval = hidpp->hid_dev->uniq; + break; default: ret = -EINVAL; break; |