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>

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a3d033252995aeb388fbcabc1dab8a286e38cb51..c2ab80e5f62a402cbbebbd9b5198549049617133 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -595,16 +595,10 @@ config THRUSTMASTER_FF
 config HID_WACOM
        tristate "Wacom Bluetooth devices support"
        depends on BT_HIDP
-       ---help---
-       Support for Wacom Graphire Bluetooth tablet.
-
-config HID_WACOM_POWER_SUPPLY
-       bool "Wacom Bluetooth devices power supply status support"
        depends on HID_WACOM
        select POWER_SUPPLY
        ---help---
-         Say Y here if you want to enable power supply status monitoring for
-         Wacom Bluetooth devices.
+       Support for Wacom Graphire Bluetooth tablet.
 
 config HID_WIIMOTE
        tristate "Nintendo Wii Remote support"

diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 067e2963314c6882a9f7854267048658388d2aea..46de2acada464cc2a76205eae4e35b59b6e2c725 100644 (file)
--- 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));
 }