Skip to content

Commit cc84094

Browse files
xanderlentJiri Kosina
authored andcommitted
HID: apple: Eliminate obsolete IR receiver quirks
This code has been dead since 2013, when the appleir driver was added by commit 9a4a557 ("HID: appleir: add support for Apple ir devices"), removing Apple IR receivers from this driver. No other Apple devices use these quirks, so drop them. Signed-off-by: Alexander F. Lent <lx@xanderlent.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
1 parent 83ec916 commit cc84094

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

drivers/hid/hid-apple.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
#define APPLE_RDESC_JIS 0x0001
2525
#define APPLE_IGNORE_MOUSE 0x0002
2626
#define APPLE_HAS_FN 0x0004
27-
#define APPLE_HIDDEV 0x0008
27+
/* 0x0008 reserved, was: APPLE_HIDDEV */
2828
/* 0x0010 reserved, was: APPLE_ISO_KEYBOARD */
2929
#define APPLE_MIGHTYMOUSE 0x0020
3030
#define APPLE_INVERT_HWHEEL 0x0040
31-
#define APPLE_IGNORE_HIDINPUT 0x0080
31+
/* 0x0080 reserved, was: APPLE_IGNORE_HIDINPUT */
3232
#define APPLE_NUMLOCK_EMULATION 0x0100
3333

3434
#define APPLE_FLAG_FKEY 0x01
@@ -433,7 +433,6 @@ static int apple_probe(struct hid_device *hdev,
433433
{
434434
unsigned long quirks = id->driver_data;
435435
struct apple_sc *asc;
436-
unsigned int connect_mask = HID_CONNECT_DEFAULT;
437436
int ret;
438437

439438
asc = devm_kzalloc(&hdev->dev, sizeof(*asc), GFP_KERNEL);
@@ -452,12 +451,7 @@ static int apple_probe(struct hid_device *hdev,
452451
return ret;
453452
}
454453

455-
if (quirks & APPLE_HIDDEV)
456-
connect_mask |= HID_CONNECT_HIDDEV_FORCE;
457-
if (quirks & APPLE_IGNORE_HIDINPUT)
458-
connect_mask &= ~HID_CONNECT_HIDINPUT;
459-
460-
ret = hid_hw_start(hdev, connect_mask);
454+
ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT);
461455
if (ret) {
462456
hid_err(hdev, "hw start failed\n");
463457
return ret;

0 commit comments

Comments
 (0)