HID: wacom: reuse wacom_parse_and_register() in wireless_work
Removes duplicated code. The only difference is that we now need to stop and start the attached hid device, but this is a small cost. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Acked-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
a2f091af75
commit
fd5f92b6d3
|
@ -1525,7 +1525,7 @@ static size_t wacom_compute_pktlen(struct hid_device *hdev)
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void wacom_update_name(struct wacom *wacom)
|
static void wacom_update_name(struct wacom *wacom, const char *suffix)
|
||||||
{
|
{
|
||||||
struct wacom_wac *wacom_wac = &wacom->wacom_wac;
|
struct wacom_wac *wacom_wac = &wacom->wacom_wac;
|
||||||
struct wacom_features *features = &wacom_wac->features;
|
struct wacom_features *features = &wacom_wac->features;
|
||||||
|
@ -1561,14 +1561,14 @@ static void wacom_update_name(struct wacom *wacom)
|
||||||
|
|
||||||
/* Append the device type to the name */
|
/* Append the device type to the name */
|
||||||
snprintf(wacom_wac->pen_name, sizeof(wacom_wac->pen_name),
|
snprintf(wacom_wac->pen_name, sizeof(wacom_wac->pen_name),
|
||||||
"%s Pen", name);
|
"%s%s Pen", name, suffix);
|
||||||
snprintf(wacom_wac->touch_name, sizeof(wacom_wac->touch_name),
|
snprintf(wacom_wac->touch_name, sizeof(wacom_wac->touch_name),
|
||||||
"%s Finger", name);
|
"%s%s Finger", name, suffix);
|
||||||
snprintf(wacom_wac->pad_name, sizeof(wacom_wac->pad_name),
|
snprintf(wacom_wac->pad_name, sizeof(wacom_wac->pad_name),
|
||||||
"%s Pad", name);
|
"%s%s Pad", name, suffix);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int wacom_parse_and_register(struct wacom *wacom)
|
static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
|
||||||
{
|
{
|
||||||
struct wacom_wac *wacom_wac = &wacom->wacom_wac;
|
struct wacom_wac *wacom_wac = &wacom->wacom_wac;
|
||||||
struct wacom_features *features = &wacom_wac->features;
|
struct wacom_features *features = &wacom_wac->features;
|
||||||
|
@ -1622,7 +1622,7 @@ static int wacom_parse_and_register(struct wacom *wacom)
|
||||||
|
|
||||||
wacom_calculate_res(features);
|
wacom_calculate_res(features);
|
||||||
|
|
||||||
wacom_update_name(wacom);
|
wacom_update_name(wacom, wireless ? " (WL)" : "");
|
||||||
|
|
||||||
error = wacom_add_shared_data(hdev);
|
error = wacom_add_shared_data(hdev);
|
||||||
if (error)
|
if (error)
|
||||||
|
@ -1649,8 +1649,10 @@ static int wacom_parse_and_register(struct wacom *wacom)
|
||||||
goto fail_hw_start;
|
goto fail_hw_start;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Note that if query fails it is not a hard failure */
|
if (!wireless) {
|
||||||
wacom_query_tablet_data(hdev, features);
|
/* Note that if query fails it is not a hard failure */
|
||||||
|
wacom_query_tablet_data(hdev, features);
|
||||||
|
}
|
||||||
|
|
||||||
/* touch only Bamboo doesn't support pen */
|
/* touch only Bamboo doesn't support pen */
|
||||||
if ((features->type == BAMBOO_TOUCH) &&
|
if ((features->type == BAMBOO_TOUCH) &&
|
||||||
|
@ -1745,22 +1747,10 @@ static void wacom_wireless_work(struct work_struct *work)
|
||||||
/* Stylus interface */
|
/* Stylus interface */
|
||||||
wacom_wac1->features =
|
wacom_wac1->features =
|
||||||
*((struct wacom_features *)id->driver_data);
|
*((struct wacom_features *)id->driver_data);
|
||||||
wacom_wac1->features.device_type |= WACOM_DEVICETYPE_PEN;
|
|
||||||
wacom_set_default_phy(&wacom_wac1->features);
|
|
||||||
wacom_calculate_res(&wacom_wac1->features);
|
|
||||||
snprintf(wacom_wac1->pen_name, WACOM_NAME_MAX, "%s (WL) Pen",
|
|
||||||
wacom_wac1->features.name);
|
|
||||||
if (wacom_wac1->features.type < BAMBOO_PEN ||
|
|
||||||
wacom_wac1->features.type > BAMBOO_PT) {
|
|
||||||
snprintf(wacom_wac1->pad_name, WACOM_NAME_MAX,
|
|
||||||
"%s (WL) Pad", wacom_wac1->features.name);
|
|
||||||
wacom_wac1->features.device_type |= WACOM_DEVICETYPE_PAD;
|
|
||||||
}
|
|
||||||
wacom_wac1->shared->touch_max = wacom_wac1->features.touch_max;
|
|
||||||
wacom_wac1->shared->type = wacom_wac1->features.type;
|
|
||||||
wacom_wac1->pid = wacom_wac->pid;
|
wacom_wac1->pid = wacom_wac->pid;
|
||||||
error = wacom_allocate_inputs(wacom1) ||
|
hid_hw_stop(hdev1);
|
||||||
wacom_register_inputs(wacom1);
|
error = wacom_parse_and_register(wacom1, true);
|
||||||
if (error)
|
if (error)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
|
@ -1770,30 +1760,11 @@ static void wacom_wireless_work(struct work_struct *work)
|
||||||
wacom_wac1->features.type <= BAMBOO_PT)) {
|
wacom_wac1->features.type <= BAMBOO_PT)) {
|
||||||
wacom_wac2->features =
|
wacom_wac2->features =
|
||||||
*((struct wacom_features *)id->driver_data);
|
*((struct wacom_features *)id->driver_data);
|
||||||
wacom_wac2->features.pktlen = WACOM_PKGLEN_BBTOUCH3;
|
|
||||||
wacom_set_default_phy(&wacom_wac2->features);
|
|
||||||
wacom_wac2->features.x_max = wacom_wac2->features.y_max = 4096;
|
|
||||||
wacom_calculate_res(&wacom_wac2->features);
|
|
||||||
snprintf(wacom_wac2->touch_name, WACOM_NAME_MAX,
|
|
||||||
"%s (WL) Finger", wacom_wac2->features.name);
|
|
||||||
if (wacom_wac1->features.touch_max)
|
|
||||||
wacom_wac2->features.device_type |= WACOM_DEVICETYPE_TOUCH;
|
|
||||||
if (wacom_wac1->features.type >= INTUOSHT &&
|
|
||||||
wacom_wac1->features.type <= BAMBOO_PT) {
|
|
||||||
snprintf(wacom_wac2->pad_name, WACOM_NAME_MAX,
|
|
||||||
"%s (WL) Pad", wacom_wac2->features.name);
|
|
||||||
wacom_wac2->features.device_type |= WACOM_DEVICETYPE_PAD;
|
|
||||||
}
|
|
||||||
wacom_wac2->pid = wacom_wac->pid;
|
wacom_wac2->pid = wacom_wac->pid;
|
||||||
error = wacom_allocate_inputs(wacom2) ||
|
hid_hw_stop(hdev2);
|
||||||
wacom_register_inputs(wacom2);
|
error = wacom_parse_and_register(wacom2, true);
|
||||||
if (error)
|
if (error)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
if ((wacom_wac1->features.type == INTUOSHT ||
|
|
||||||
wacom_wac1->features.type == INTUOSHT2) &&
|
|
||||||
wacom_wac1->features.touch_max)
|
|
||||||
wacom_wac->shared->touch_input = wacom_wac2->touch_input;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
error = wacom_initialize_battery(wacom);
|
error = wacom_initialize_battery(wacom);
|
||||||
|
@ -1855,7 +1826,7 @@ static int wacom_probe(struct hid_device *hdev,
|
||||||
goto fail_parse;
|
goto fail_parse;
|
||||||
}
|
}
|
||||||
|
|
||||||
error = wacom_parse_and_register(wacom);
|
error = wacom_parse_and_register(wacom, false);
|
||||||
if (error)
|
if (error)
|
||||||
goto fail_parse;
|
goto fail_parse;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue