Re: [PATCH] hid: Initialize battery_no to -1 & correct its format string
From: Jiri Kosina <hidden>
Date: 2014-12-29 12:04:02
Also in:
lkml
On Sun, 28 Dec 2014, Aniroop Mathur wrote:
From: Aniroop Mathur <redacted> This patch initializes battery_no to -1 to avoid extra subtraction operation performed everytime wacom battery is initialized
This is so femto-optimization, that I don't really care deeply. Adding Jason and Ping to CC. If they want this, I'll apply the patch.
quoted hunk ↗ jump to hunk
and correct format string of unsigned long from %ld to %lu. Signed-off-by: Aniroop Mathur <redacted> --- drivers/hid/wacom_sys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 129fd33..4b5ff84 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c@@ -919,17 +919,17 @@ static int wacom_ac_get_property(struct power_supply *psy, static int wacom_initialize_battery(struct wacom *wacom) { - static atomic_t battery_no = ATOMIC_INIT(0); + static atomic_t battery_no = ATOMIC_INIT(-1); int error; unsigned long n; if (wacom->wacom_wac.features.quirks & WACOM_QUIRK_BATTERY) { - n = atomic_inc_return(&battery_no) - 1; + n = atomic_inc_return(&battery_no); wacom->battery.properties = wacom_battery_props; wacom->battery.num_properties = ARRAY_SIZE(wacom_battery_props); wacom->battery.get_property = wacom_battery_get_property; - sprintf(wacom->wacom_wac.bat_name, "wacom_battery_%ld", n); + sprintf(wacom->wacom_wac.bat_name, "wacom_battery_%lu", n); wacom->battery.name = wacom->wacom_wac.bat_name; wacom->battery.type = POWER_SUPPLY_TYPE_BATTERY; wacom->battery.use_for_apm = 0;@@ -937,7 +937,7 @@ static int wacom_initialize_battery(struct wacom *wacom) wacom->ac.properties = wacom_ac_props; wacom->ac.num_properties = ARRAY_SIZE(wacom_ac_props); wacom->ac.get_property = wacom_ac_get_property; - sprintf(wacom->wacom_wac.ac_name, "wacom_ac_%ld", n); + sprintf(wacom->wacom_wac.ac_name, "wacom_ac_%lu", n); wacom->ac.name = wacom->wacom_wac.ac_name; wacom->ac.type = POWER_SUPPLY_TYPE_MAINS; wacom->ac.use_for_apm = 0;-- 1.9.1
-- Jiri Kosina SUSE Labs