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>

diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index 2259eaa8b98886d8ae0ec454a2a0fce8aa99e695..a77269b06880902c1d8a2d7203bd7806c30454e8 100644 (file)
--- 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)
 
        if (sc->quirks & VAIO_RDESC_CONSTANT)
                connect_mask |= HID_CONNECT_HIDDEV_FORCE;
-       else if (sc->quirks & SIXAXIS_CONTROLLER_USB)
-               connect_mask |= HID_CONNECT_HIDDEV_FORCE;
-       else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
+       else if (sc->quirks & SIXAXIS_CONTROLLER)
                connect_mask |= HID_CONNECT_HIDDEV_FORCE;
 
        ret = hid_hw_start(hdev, connect_mask);