diff options
| author | Przemo Firszt <przemo@firszt.eu> | 2012-03-22 18:54:05 +0000 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-03-28 10:22:56 +0200 |
| commit | 224b321b312e9c03989e1563beaa50f98f9b48e0 (patch) | |
| tree | 556274ddcb84117bb4cb31b6e7e8cbab6ee4f665 /drivers/hid/hid-wacom.c | |
| parent | d464c92b5234227c1698862a1906827e2e398ae0 (diff) | |
| download | op-kernel-dev-224b321b312e9c03989e1563beaa50f98f9b48e0.zip op-kernel-dev-224b321b312e9c03989e1563beaa50f98f9b48e0.tar.gz | |
HID: wacom: Remove CONFIG_HID_WACOM_POWER_SUPPLY option
This option was ment as a safety mechanism in case the system treats the wacom
tablet battery as the main power supply. It's no longer required as now we can
distinguish between system power supply and device power supply.
Signed-off-by: Przemo Firszt <przemo@firszt.eu>
Reviewed-by: Chris Bagwell <chris@cnpbagwell.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/hid-wacom.c')
| -rw-r--r-- | drivers/hid/hid-wacom.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index 067e296..46de2ac 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c @@ -25,9 +25,7 @@ #include <linux/hid.h> #include <linux/module.h> #include <linux/slab.h> -#ifdef CONFIG_HID_WACOM_POWER_SUPPLY #include <linux/power_supply.h> -#endif #include "hid-ids.h" @@ -41,14 +39,11 @@ struct wacom_data { __u32 id; __u32 serial; unsigned char high_speed; -#ifdef CONFIG_HID_WACOM_POWER_SUPPLY int battery_capacity; struct power_supply battery; struct power_supply ac; -#endif }; -#ifdef CONFIG_HID_WACOM_POWER_SUPPLY /*percent of battery capacity, 0 means AC online*/ static unsigned short batcap[8] = { 1, 15, 25, 35, 50, 70, 100, 0 }; @@ -120,7 +115,6 @@ static int wacom_ac_get_property(struct power_supply *psy, } return ret; } -#endif static void wacom_set_features(struct hid_device *hdev) { @@ -310,12 +304,10 @@ static int wacom_gr_parse_report(struct hid_device *hdev, input_sync(input); } -#ifdef CONFIG_HID_WACOM_POWER_SUPPLY /* Store current battery capacity */ rw = (data[7] >> 2 & 0x07); if (rw != wdata->battery_capacity) wdata->battery_capacity = rw; -#endif return 1; } @@ -596,7 +588,6 @@ static int wacom_probe(struct hid_device *hdev, break; } -#ifdef CONFIG_HID_WACOM_POWER_SUPPLY wdata->battery.properties = wacom_battery_props; wdata->battery.num_properties = ARRAY_SIZE(wacom_battery_props); wdata->battery.get_property = wacom_battery_get_property; @@ -629,16 +620,13 @@ static int wacom_probe(struct hid_device *hdev, } power_supply_powers(&wdata->ac, &hdev->dev); -#endif return 0; -#ifdef CONFIG_HID_WACOM_POWER_SUPPLY err_ac: power_supply_unregister(&wdata->battery); err_battery: device_remove_file(&hdev->dev, &dev_attr_speed); hid_hw_stop(hdev); -#endif err_free: kfree(wdata); return ret; @@ -646,16 +634,12 @@ err_free: static void wacom_remove(struct hid_device *hdev) { -#ifdef CONFIG_HID_WACOM_POWER_SUPPLY struct wacom_data *wdata = hid_get_drvdata(hdev); -#endif device_remove_file(&hdev->dev, &dev_attr_speed); hid_hw_stop(hdev); -#ifdef CONFIG_HID_WACOM_POWER_SUPPLY power_supply_unregister(&wdata->battery); power_supply_unregister(&wdata->ac); -#endif kfree(hid_get_drvdata(hdev)); } |
