Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32043d0f authored by Benjamin Tissoires's avatar Benjamin Tissoires Committed by Jiri Kosina
Browse files

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: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Tested-by: default avatarBastien Nocera <hadess@hadess.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent eb626c57

drivers/hid/hid-logitech-hidpp.c

+15 −0
Original line number Diff line number Diff line
@@ -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;