Skip to content

Commit 487b23a

Browse files
Hans de GoedeJiri Kosina
authored andcommitted
HID: input: Drop Asus UX550* touchscreen ignore battery quirks
Drop the Asus UX550* touchscreen ignore battery quirks, there is a blanket HID_BATTERY_QUIRK_IGNORE for all USB_VENDOR_ID_ELAN USB touchscreens now, so these are just a duplicate of those. Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com> Signed-off-by: Jiri Kosina <jkosina@suse.com>
1 parent d1afcd7 commit 487b23a

2 files changed

Lines changed: 0 additions & 6 deletions

File tree

drivers/hid/hid-ids.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,6 @@
455455
#define USB_DEVICE_ID_TOSHIBA_CLICK_L9W 0x0401
456456
#define USB_DEVICE_ID_HP_X2 0x074d
457457
#define USB_DEVICE_ID_HP_X2_10_COVER 0x0755
458-
#define USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN 0x2544
459-
#define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN 0x2706
460458
#define I2C_DEVICE_ID_CHROMEBOOK_TROGDOR_POMPOM 0x2F81
461459

462460
#define USB_VENDOR_ID_ELECOM 0x056e

drivers/hid/hid-input.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -386,10 +386,6 @@ static const struct hid_device_id hid_battery_quirks[] = {
386386
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH,
387387
USB_DEVICE_ID_LOGITECH_DINOVO_EDGE_KBD),
388388
HID_BATTERY_QUIRK_IGNORE },
389-
{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN),
390-
HID_BATTERY_QUIRK_IGNORE },
391-
{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN),
392-
HID_BATTERY_QUIRK_IGNORE },
393389
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L),
394390
HID_BATTERY_QUIRK_AVOID_QUERY },
395391
{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_PRO_MW),

0 commit comments

Comments
 (0)