diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 21:53:05 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 21:53:05 -0500 |
commit | b24ca57e7625bc304e77bc429693ad32a691eb16 (patch) | |
tree | 770aa389c6e763cf37776a35e85ff1e41958b1e9 /drivers/hid | |
parent | 6296e5d3c067df41980a5fd09ad4cc6765f79bb9 (diff) | |
parent | 913272b3864d6da89c70d9fc2c30ccb57794b369 (diff) |
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: (68 commits)
power_supply: Mark da9052 driver as broken
power_supply: Drop usage of nowarn variant of sysfs_create_link()
s3c_adc_battery: Average over more than one adc sample
power_supply: Add DA9052 battery driver
isp1704_charger: Fix missing check
jz4740-battery: Fix signedness bug
power_supply: Assume mains power by default
sbs-battery: Fix devicetree match table
ARM: rx51: Add bq27200 i2c board info
sbs-battery: Change power supply name
devicetree-bindings: Propagate bq20z75->sbs rename to dt bindings
devicetree-bindings: Add vendor entry for Smart Battery Systems
sbs-battery: Rename internals to new name
bq20z75: Rename to sbs-battery
wm97xx_battery: Use DEFINE_MUTEX() for work_lock
max8997_charger: Remove duplicate module.h
lp8727_charger: Some minor fixes for the header
lp8727_charger: Add header file
power_supply: Convert drivers/power/* to use module_platform_driver()
power_supply: Add "unknown" in power supply type
...
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-wacom.c | 16 | ||||
-rw-r--r-- | drivers/hid/hid-wiimote-core.c | 10 |
2 files changed, 23 insertions, 3 deletions
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index f2183486a9b6..b47e58b52d9f 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c | |||
@@ -49,12 +49,14 @@ static unsigned short batcap[8] = { 1, 15, 25, 35, 50, 70, 100, 0 }; | |||
49 | 49 | ||
50 | static enum power_supply_property wacom_battery_props[] = { | 50 | static enum power_supply_property wacom_battery_props[] = { |
51 | POWER_SUPPLY_PROP_PRESENT, | 51 | POWER_SUPPLY_PROP_PRESENT, |
52 | POWER_SUPPLY_PROP_CAPACITY | 52 | POWER_SUPPLY_PROP_CAPACITY, |
53 | POWER_SUPPLY_PROP_SCOPE, | ||
53 | }; | 54 | }; |
54 | 55 | ||
55 | static enum power_supply_property wacom_ac_props[] = { | 56 | static enum power_supply_property wacom_ac_props[] = { |
56 | POWER_SUPPLY_PROP_PRESENT, | 57 | POWER_SUPPLY_PROP_PRESENT, |
57 | POWER_SUPPLY_PROP_ONLINE | 58 | POWER_SUPPLY_PROP_ONLINE, |
59 | POWER_SUPPLY_PROP_SCOPE, | ||
58 | }; | 60 | }; |
59 | 61 | ||
60 | static int wacom_battery_get_property(struct power_supply *psy, | 62 | static int wacom_battery_get_property(struct power_supply *psy, |
@@ -70,6 +72,9 @@ static int wacom_battery_get_property(struct power_supply *psy, | |||
70 | case POWER_SUPPLY_PROP_PRESENT: | 72 | case POWER_SUPPLY_PROP_PRESENT: |
71 | val->intval = 1; | 73 | val->intval = 1; |
72 | break; | 74 | break; |
75 | case POWER_SUPPLY_PROP_SCOPE: | ||
76 | val->intval = POWER_SUPPLY_SCOPE_DEVICE; | ||
77 | break; | ||
73 | case POWER_SUPPLY_PROP_CAPACITY: | 78 | case POWER_SUPPLY_PROP_CAPACITY: |
74 | /* show 100% battery capacity when charging */ | 79 | /* show 100% battery capacity when charging */ |
75 | if (power_state == 0) | 80 | if (power_state == 0) |
@@ -101,6 +106,9 @@ static int wacom_ac_get_property(struct power_supply *psy, | |||
101 | else | 106 | else |
102 | val->intval = 0; | 107 | val->intval = 0; |
103 | break; | 108 | break; |
109 | case POWER_SUPPLY_PROP_SCOPE: | ||
110 | val->intval = POWER_SUPPLY_SCOPE_DEVICE; | ||
111 | break; | ||
104 | default: | 112 | default: |
105 | ret = -EINVAL; | 113 | ret = -EINVAL; |
106 | break; | 114 | break; |
@@ -523,6 +531,8 @@ static int wacom_probe(struct hid_device *hdev, | |||
523 | wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY; | 531 | wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY; |
524 | wdata->battery.use_for_apm = 0; | 532 | wdata->battery.use_for_apm = 0; |
525 | 533 | ||
534 | power_supply_powers(&wdata->battery, &hdev->dev); | ||
535 | |||
526 | ret = power_supply_register(&hdev->dev, &wdata->battery); | 536 | ret = power_supply_register(&hdev->dev, &wdata->battery); |
527 | if (ret) { | 537 | if (ret) { |
528 | hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n", | 538 | hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n", |
@@ -537,6 +547,8 @@ static int wacom_probe(struct hid_device *hdev, | |||
537 | wdata->ac.type = POWER_SUPPLY_TYPE_MAINS; | 547 | wdata->ac.type = POWER_SUPPLY_TYPE_MAINS; |
538 | wdata->ac.use_for_apm = 0; | 548 | wdata->ac.use_for_apm = 0; |
539 | 549 | ||
550 | power_supply_powers(&wdata->battery, &hdev->dev); | ||
551 | |||
540 | ret = power_supply_register(&hdev->dev, &wdata->ac); | 552 | ret = power_supply_register(&hdev->dev, &wdata->ac); |
541 | if (ret) { | 553 | if (ret) { |
542 | hid_warn(hdev, | 554 | hid_warn(hdev, |
diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c index 61881b35c670..fc253b472f9d 100644 --- a/drivers/hid/hid-wiimote-core.c +++ b/drivers/hid/hid-wiimote-core.c | |||
@@ -52,7 +52,8 @@ static __u16 wiiproto_keymap[] = { | |||
52 | }; | 52 | }; |
53 | 53 | ||
54 | static enum power_supply_property wiimote_battery_props[] = { | 54 | static enum power_supply_property wiimote_battery_props[] = { |
55 | POWER_SUPPLY_PROP_CAPACITY | 55 | POWER_SUPPLY_PROP_CAPACITY, |
56 | POWER_SUPPLY_PROP_SCOPE, | ||
56 | }; | 57 | }; |
57 | 58 | ||
58 | static ssize_t wiimote_hid_send(struct hid_device *hdev, __u8 *buffer, | 59 | static ssize_t wiimote_hid_send(struct hid_device *hdev, __u8 *buffer, |
@@ -402,6 +403,11 @@ static int wiimote_battery_get_property(struct power_supply *psy, | |||
402 | int ret = 0, state; | 403 | int ret = 0, state; |
403 | unsigned long flags; | 404 | unsigned long flags; |
404 | 405 | ||
406 | if (psp == POWER_SUPPLY_PROP_SCOPE) { | ||
407 | val->intval = POWER_SUPPLY_SCOPE_DEVICE; | ||
408 | return 0; | ||
409 | } | ||
410 | |||
405 | ret = wiimote_cmd_acquire(wdata); | 411 | ret = wiimote_cmd_acquire(wdata); |
406 | if (ret) | 412 | if (ret) |
407 | return ret; | 413 | return ret; |
@@ -1220,6 +1226,8 @@ static int wiimote_hid_probe(struct hid_device *hdev, | |||
1220 | wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY; | 1226 | wdata->battery.type = POWER_SUPPLY_TYPE_BATTERY; |
1221 | wdata->battery.use_for_apm = 0; | 1227 | wdata->battery.use_for_apm = 0; |
1222 | 1228 | ||
1229 | power_supply_powers(&wdata->battery, &hdev->dev); | ||
1230 | |||
1223 | ret = power_supply_register(&wdata->hdev->dev, &wdata->battery); | 1231 | ret = power_supply_register(&wdata->hdev->dev, &wdata->battery); |
1224 | if (ret) { | 1232 | if (ret) { |
1225 | hid_err(hdev, "Cannot register battery device\n"); | 1233 | hid_err(hdev, "Cannot register battery device\n"); |