Re: [Linuxwacom-devel] [PATCH 1/3] HID: wacom: Remove CONFIG_HID_WACOM_POWER_SUPPLY option
Dnia 2012-03-19, pon o godzinie 19:08 +, Przemo Firszt pisze: 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 prz...@firszt.eu Reviewed-by: Chris Bagwell ch...@cnpbagwell.com --- Jiri, I just noticed that there is one more CONFIG_HID_WACOM_POWER_SUPPLY in drivers/hid/hid-wacom.c that needs to be removed. If you didn't apply it yet I'd like to resend all 3 patches or if you alredy did it I just submit a fix patch. -- Regards, Przemo Firszt -- This SF email is sponsosred by: Try Windows Azure free for 90 days Click Here http://p.sf.net/sfu/sfd2d-msazure ___ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH 1/3] 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 prz...@firszt.eu
---
drivers/hid/Kconfig |8
drivers/hid/hid-wacom.c | 14 --
2 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a421abd..d6ed4ec 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -623,14 +623,6 @@ config HID_WACOM
---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.
-
config HID_WIIMOTE
tristate Nintendo Wii Remote support
depends on BT_HIDP
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 067e296..09d102c 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -41,14 +41,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 +117,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 +306,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 +590,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 +622,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 +636,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));
}
--
1.7.6.4
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
Re: [Linuxwacom-devel] [PATCH 1/3] HID: wacom: Remove CONFIG_HID_WACOM_POWER_SUPPLY option
On Mon, Mar 19, 2012 at 10:16 AM, Przemo Firszt prz...@firszt.eu wrote:
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 prz...@firszt.eu
---
drivers/hid/Kconfig | 8
drivers/hid/hid-wacom.c | 14 --
2 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a421abd..d6ed4ec 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -623,14 +623,6 @@ config HID_WACOM
---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
These depends and select lines need to move up to HID_WACOM. Other than that:
Reviewed-by: Chris Bagwell ch...@cnpbagwell.com
- ---help---
- Say Y here if you want to enable power supply status monitoring for
- Wacom Bluetooth devices.
-
config HID_WIIMOTE
tristate Nintendo Wii Remote support
depends on BT_HIDP
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index 067e296..09d102c 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -41,14 +41,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 +117,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 +306,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 +590,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 +622,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 +636,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));
}
--
1.7.6.4
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
[Linuxwacom-devel] [PATCH 1/3] 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 prz...@firszt.eu
Reviewed-by: Chris Bagwell ch...@cnpbagwell.com
---
drivers/hid/Kconfig |8 +---
drivers/hid/hid-wacom.c | 14 --
2 files changed, 1 insertions(+), 21 deletions(-)
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a421abd..8011d77 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -620,16 +620,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 067e296..09d102c 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -41,14 +41,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 +117,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 +306,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 +590,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 +622,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 +636,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));
}
--
1.7.6.4
--
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
___
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
Re: [Linuxwacom-devel] [PATCH 1/3] HID: wacom: Remove CONFIG_HID_WACOM_POWER_SUPPLY option
Dnia 2012-03-19, pon o godzinie 12:30 -0500, Chris Bagwell pisze: On Mon, Mar 19, 2012 at 10:16 AM, Przemo Firszt prz...@firszt.eu wrote: 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 prz...@firszt.eu --- drivers/hid/Kconfig |8 drivers/hid/hid-wacom.c | 14 -- 2 files changed, 0 insertions(+), 22 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index a421abd..d6ed4ec 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -623,14 +623,6 @@ config HID_WACOM ---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 These depends and select lines need to move up to HID_WACOM. Other than that: Reviewed-by: Chris Bagwell ch...@cnpbagwell.com Thanks Chris! -- Przemo Firszt prz...@firszt.eu -- This SF email is sponsosred by: Try Windows Azure free for 90 days Click Here http://p.sf.net/sfu/sfd2d-msazure ___ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
