aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
authorAntonio Ospite <ao2@ao2.it>2014-06-24 07:28:40 -0400
committerJiri Kosina <jkosina@suse.cz>2014-06-25 15:21:17 -0400
commit50764650c9e6e8498d273ad714f68ee8eec96692 (patch)
treefc831d52e4713077b4d4779ac4c5326c348f87eb /drivers/hid
parentd6b92c2c373e0beefa8048c1448992cd5cda6e07 (diff)
HID: sony: Use the SIXAXIS_CONTROLLER constant when possible
Instead of checking for SIXAXIS_CONTROLLER_USB and SIXAXIS_CONTROLLER_BT separately, a check on SIXAXIS_CONTROLLER can be used when setting connect_mask. Signed-off-by: Antonio Ospite <ao2@ao2.it> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-sony.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 2259eaa8b988..a77269b06880 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -1830,9 +1830,7 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
1830 1830
1831 if (sc->quirks & VAIO_RDESC_CONSTANT) 1831 if (sc->quirks & VAIO_RDESC_CONSTANT)
1832 connect_mask |= HID_CONNECT_HIDDEV_FORCE; 1832 connect_mask |= HID_CONNECT_HIDDEV_FORCE;
1833 else if (sc->quirks & SIXAXIS_CONTROLLER_USB) 1833 else if (sc->quirks & SIXAXIS_CONTROLLER)
1834 connect_mask |= HID_CONNECT_HIDDEV_FORCE;
1835 else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
1836 connect_mask |= HID_CONNECT_HIDDEV_FORCE; 1834 connect_mask |= HID_CONNECT_HIDDEV_FORCE;
1837 1835
1838 ret = hid_hw_start(hdev, connect_mask); 1836 ret = hid_hw_start(hdev, connect_mask);