rk: revert 20f3d0b+v3.0.66 to v3.0

[firefly-linux-kernel-4.4.55.git] / drivers / hid / hid-chicony.c

diff --git a/drivers/hid/hid-chicony.c b/drivers/hid/hid-chicony.c
index b99af346fdff310a985fc01fd7fecd7024427e40..8965ad93d51003c47fd3ac570b897f6ee065de03 100644 (file)
--- a/drivers/hid/hid-chicony.c
+++ b/drivers/hid/hid-chicony.c
@@ -45,12 +45,6 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
        case 0xff09: ch_map_key_clear(BTN_9);   break;
        case 0xff0a: ch_map_key_clear(BTN_A);   break;
        case 0xff0b: ch_map_key_clear(BTN_B);   break;
-       case 0x00f1: ch_map_key_clear(KEY_WLAN);        break;
-       case 0x00f2: ch_map_key_clear(KEY_BRIGHTNESSDOWN);      break;
-       case 0x00f3: ch_map_key_clear(KEY_BRIGHTNESSUP);        break;
-       case 0x00f4: ch_map_key_clear(KEY_DISPLAY_OFF); break;
-       case 0x00f7: ch_map_key_clear(KEY_CAMERA);      break;
-       case 0x00f8: ch_map_key_clear(KEY_PROG1);       break;
        default:
                return 0;
        }
@@ -59,7 +53,6 @@ static int ch_input_mapping(struct hid_device *hdev, struct hid_input *hi,
 
 static const struct hid_device_id ch_devices[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_TACTICAL_PAD) },
-       { HID_USB_DEVICE(USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_WIRELESS2) },
        { }
 };
 MODULE_DEVICE_TABLE(hid, ch_devices);