diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2006-05-30 10:21:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-21 18:04:14 -0400 |
commit | 633a7ecf89587879161179ac4f5a03722626866f (patch) | |
tree | ecbc0930e6644ce0b3719e19c656d3ddd7d8f55f | |
parent | 3f8f4a18f4f76a67fe5b80da1d3a3940e41a14a8 (diff) |
[PATCH] usbhid: Remove unneeded blacklist entries
Now that usbhid automatically applies HID_QUIRK_NOGET to keyboards and
mice, we no longer need the blacklist entries that were present for no
other purpose. This patch (as698) removes them.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/usb/input/hid-core.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 061002fc66f..c6051beeabd 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -1374,9 +1374,6 @@ void hid_close(struct hid_device *hid) | |||
1374 | 1374 | ||
1375 | #define USB_VENDOR_ID_PANJIT 0x134c | 1375 | #define USB_VENDOR_ID_PANJIT 0x134c |
1376 | 1376 | ||
1377 | #define USB_VENDOR_ID_SILVERCREST 0x062a | ||
1378 | #define USB_DEVICE_ID_SILVERCREST_KB 0x0201 | ||
1379 | |||
1380 | /* | 1377 | /* |
1381 | * Initialize all reports | 1378 | * Initialize all reports |
1382 | */ | 1379 | */ |
@@ -1461,9 +1458,6 @@ void hid_init_reports(struct hid_device *hid) | |||
1461 | #define USB_VENDOR_ID_ONTRAK 0x0a07 | 1458 | #define USB_VENDOR_ID_ONTRAK 0x0a07 |
1462 | #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064 | 1459 | #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064 |
1463 | 1460 | ||
1464 | #define USB_VENDOR_ID_TANGTOP 0x0d3d | ||
1465 | #define USB_DEVICE_ID_TANGTOP_USBPS2 0x0001 | ||
1466 | |||
1467 | #define USB_VENDOR_ID_ESSENTIAL_REALITY 0x0d7f | 1461 | #define USB_VENDOR_ID_ESSENTIAL_REALITY 0x0d7f |
1468 | #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100 | 1462 | #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100 |
1469 | 1463 | ||
@@ -1520,12 +1514,6 @@ void hid_init_reports(struct hid_device *hid) | |||
1520 | #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 | 1514 | #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 |
1521 | #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a | 1515 | #define USB_DEVICE_ID_MCC_PMD1208LS 0x007a |
1522 | 1516 | ||
1523 | #define USB_VENDOR_ID_CHICONY 0x04f2 | ||
1524 | #define USB_DEVICE_ID_CHICONY_USBHUB_KB 0x0100 | ||
1525 | |||
1526 | #define USB_VENDOR_ID_BTC 0x046e | ||
1527 | #define USB_DEVICE_ID_BTC_KEYBOARD 0x5303 | ||
1528 | |||
1529 | #define USB_VENDOR_ID_VERNIER 0x08f7 | 1517 | #define USB_VENDOR_ID_VERNIER 0x08f7 |
1530 | #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001 | 1518 | #define USB_DEVICE_ID_VERNIER_LABPRO 0x0001 |
1531 | #define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002 | 1519 | #define USB_DEVICE_ID_VERNIER_GOTEMP 0x0002 |
@@ -1554,15 +1542,6 @@ void hid_init_reports(struct hid_device *hid) | |||
1554 | #define USB_VENDOR_ID_CHERRY 0x046a | 1542 | #define USB_VENDOR_ID_CHERRY 0x046a |
1555 | #define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023 | 1543 | #define USB_DEVICE_ID_CHERRY_CYMOTION 0x0023 |
1556 | 1544 | ||
1557 | #define USB_VENDOR_ID_HP 0x03f0 | ||
1558 | #define USB_DEVICE_ID_HP_USBHUB_KB 0x020c | ||
1559 | |||
1560 | #define USB_VENDOR_ID_IBM 0x04b3 | ||
1561 | #define USB_DEVICE_ID_IBM_USBHUB_KB 0x3005 | ||
1562 | |||
1563 | #define USB_VENDOR_ID_CREATIVELABS 0x062a | ||
1564 | #define USB_DEVICE_ID_CREATIVELABS_SILVERCREST 0x0201 | ||
1565 | |||
1566 | #define USB_VENDOR_ID_YEALINK 0x6993 | 1545 | #define USB_VENDOR_ID_YEALINK 0x6993 |
1567 | #define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001 | 1546 | #define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001 |
1568 | /* | 1547 | /* |
@@ -1683,14 +1662,7 @@ static const struct hid_blacklist { | |||
1683 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET }, | 1662 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_2PORTKVM, HID_QUIRK_NOGET }, |
1684 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, | 1663 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVM, HID_QUIRK_NOGET }, |
1685 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET }, | 1664 | { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET }, |
1686 | { USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_KEYBOARD, HID_QUIRK_NOGET}, | ||
1687 | { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET}, | ||
1688 | { USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVELABS_SILVERCREST, HID_QUIRK_NOGET }, | ||
1689 | { USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET }, | ||
1690 | { USB_VENDOR_ID_IBM, USB_DEVICE_ID_IBM_USBHUB_KB, HID_QUIRK_NOGET }, | ||
1691 | { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET }, | ||
1692 | { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, | 1665 | { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT }, |
1693 | { USB_VENDOR_ID_SILVERCREST, USB_DEVICE_ID_SILVERCREST_KB, HID_QUIRK_NOGET }, | ||
1694 | 1666 | ||
1695 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL }, | 1667 | { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE, HID_QUIRK_MIGHTYMOUSE | HID_QUIRK_INVERT_HWHEEL }, |
1696 | { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 }, | 1668 | { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 }, |