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

Commit 35b4c01e authored Dec 09, 2011 by Jeremy Fitzhardinge

power_supply: add "powers" links to self-powered HID devices



Make the relationship between the Wiimote and Wacom self-powered HID
devices and their power supply explicit by adding a "powers" link.

Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Jiri Kosina <jkosina@suse.cz>

parent 73db8813

drivers/hid/hid-wacom.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -397,6 +397,8 @@ static int wacom_probe(struct hid_device *hdev,
	wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;		wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
	wdata->battery.use_for_apm = 0;		wdata->battery.use_for_apm = 0;

			power_supply_powers(&wdata->battery, &hdev->dev);

	ret = power_supply_register(&hdev->dev, &wdata->battery);		ret = power_supply_register(&hdev->dev, &wdata->battery);
	if (ret) {		if (ret) {
	hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",		hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",
	@@ -411,6 +413,8 @@ static int wacom_probe(struct hid_device *hdev,
	wdata->ac.type = POWER_SUPPLY_TYPE_MAINS;		wdata->ac.type = POWER_SUPPLY_TYPE_MAINS;
	wdata->ac.use_for_apm = 0;		wdata->ac.use_for_apm = 0;

			power_supply_powers(&wdata->battery, &hdev->dev);

	ret = power_supply_register(&hdev->dev, &wdata->ac);		ret = power_supply_register(&hdev->dev, &wdata->ac);
	if (ret) {		if (ret) {
	hid_warn(hdev,		hid_warn(hdev,

drivers/hid/hid-wiimote.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1263,6 +1263,8 @@ static int wiimote_hid_probe(struct hid_device *hdev,
	wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;		wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY;
	wdata->battery.use_for_apm = 0;		wdata->battery.use_for_apm = 0;

			power_supply_powers(&wdata->battery, &hdev->dev);

	ret = power_supply_register(&wdata->hdev->dev, &wdata->battery);		ret = power_supply_register(&wdata->hdev->dev, &wdata->battery);
	if (ret) {		if (ret) {
	hid_err(hdev, "Cannot register battery device\n");		hid_err(hdev, "Cannot register battery device\n");