mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 23:58:05 +00:00
Code Issues Releases Wiki Activity

hid-input/battery: make the battery setup common for INPUTs and FEATUREs

Browse source 
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
This commit is contained in:
Jeremy Fitzhardinge 2011-12-02 19:05:07 -08:00
parent fb8ac91b4d
commit 2f2e3f6d7a
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/hid/hid-input.c
View file

@ -351,20 +351,22 @@ static int hidinput_get_battery_property(struct power_supply *psy,
return ret; return ret;
} }
static void hidinput_setup_battery(struct hid_device *dev, static bool hidinput_setup_battery(struct hid_device *dev, unsigned report_type, struct hid_field *field)
unsigned report_type, unsigned report_id,
s32 min, s32 max)
{ {
struct power_supply *battery = &dev->battery; struct power_supply *battery = &dev->battery;
int ret; int ret;
unsigned quirks; unsigned quirks;
s32 min, max;
if (field->usage->hid != HID_DC_BATTERYSTRENGTH)
return false; /* no match */
if (battery->name != NULL) if (battery->name != NULL)
return; /* already initialized? */ goto out; /* already initialized? */
battery->name = kasprintf(GFP_KERNEL, "hid-%s-battery", dev->uniq); battery->name = kasprintf(GFP_KERNEL, "hid-%s-battery", dev->uniq);
if (battery->name == NULL) if (battery->name == NULL)
return; goto out;
battery->type = POWER_SUPPLY_TYPE_USB; battery->type = POWER_SUPPLY_TYPE_USB;
battery->properties = hidinput_battery_props; battery->properties = hidinput_battery_props;
@ -374,6 +376,9 @@ static void hidinput_setup_battery(struct hid_device *dev,
quirks = find_battery_quirk(dev); quirks = find_battery_quirk(dev);
min = field->logical_minimum;
max = field->logical_maximum;
if (quirks & HID_BATTERY_QUIRK_PERCENT) { if (quirks & HID_BATTERY_QUIRK_PERCENT) {
min = 0; min = 0;
max = 100; max = 100;
@ -382,7 +387,7 @@ static void hidinput_setup_battery(struct hid_device *dev,
dev->battery_min = min; dev->battery_min = min;
dev->battery_max = max; dev->battery_max = max;
dev->battery_report_type = report_type; dev->battery_report_type = report_type;
dev->battery_report_id = report_id; dev->battery_report_id = field->report->id;
ret = power_supply_register(&dev->dev, battery); ret = power_supply_register(&dev->dev, battery);
if (ret != 0) { if (ret != 0) {
@ -390,6 +395,9 @@ static void hidinput_setup_battery(struct hid_device *dev,
kfree(battery->name); kfree(battery->name);
battery->name = NULL; battery->name = NULL;
} }
out:
return true;
} }
static void hidinput_cleanup_battery(struct hid_device *dev) static void hidinput_cleanup_battery(struct hid_device *dev)
@ -402,10 +410,10 @@ static void hidinput_cleanup_battery(struct hid_device *dev)
dev->battery.name = NULL; dev->battery.name = NULL;
} }
#else /* !CONFIG_HID_BATTERY_STRENGTH */ #else /* !CONFIG_HID_BATTERY_STRENGTH */
static void hidinput_setup_battery(struct hid_device *dev, static bool hidinput_setup_battery(struct hid_device *dev, unsigned report_type,
unsigned report_type, unsigned report_id, struct hid_field *field)
s32 min, s32 max)
{ {
return false;
} }
static void hidinput_cleanup_battery(struct hid_device *dev) static void hidinput_cleanup_battery(struct hid_device *dev)
@ -772,14 +780,9 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
break; break;
case HID_UP_GENDEVCTRLS: case HID_UP_GENDEVCTRLS:
if ((usage->hid & HID_USAGE) == 0x20) { /* Battery Strength */ if (hidinput_setup_battery(device, HID_INPUT_REPORT, field))
hidinput_setup_battery(device,
HID_INPUT_REPORT,
field->report->id,
field->logical_minimum,
field->logical_maximum);
goto ignore; goto ignore;
} else else
goto unknown; goto unknown;
break; break;
@ -1055,13 +1058,7 @@ static void report_features(struct hid_device *hid)
for (i = 0; i < rep->maxfield; i++) for (i = 0; i < rep->maxfield; i++)
for (j = 0; j < rep->field[i]->maxusage; j++) { for (j = 0; j < rep->field[i]->maxusage; j++) {
/* Verify if Battery Strength feature is available */ /* Verify if Battery Strength feature is available */
if (((rep->field[i]->usage + j)->hid & HID_USAGE_PAGE) == HID_UP_GENDEVCTRLS && hidinput_setup_battery(hid, HID_FEATURE_REPORT, rep->field[i]);
((rep->field[i]->usage + j)->hid & HID_USAGE) == 0x20) {
hidinput_setup_battery(hid,
HID_FEATURE_REPORT, rep->id,
rep->field[i]->logical_minimum,
rep->field[i]->logical_maximum);
}
if (drv->feature_mapping) if (drv->feature_mapping)
drv->feature_mapping(hid, rep->field[i], drv->feature_mapping(hid, rep->field[i],