HID: sony: fix incorrect Squier name and remove non-existent device
PATCH 1/1 HID: sony: fix incorrect Squier name and remove non-existent device
This patch fixes the Squier device name and removes a non-existent device from hid-sony.
Co-developed-by Sanjay Govind <[email protected]>
Signed-off-by Sanjay Govind <[email protected]>
Signed-off-by Rosalie Wanders <[email protected]>
--- drivers/hid/hid-ids.h | 6 ++---- drivers/hid/hid-sony.c | 8 ++------ 2 files changed, 4 insertions(+), 10 deletions(-)
drivers/hid/hid-ids.h +2 -4
@@ -671,9 +671,8 @@#define USB_DEVICE_ID_HARMONIX_WII_RB2_DRUMS 0x3110#define USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_DRUMS_MODE 0x3138#define USB_DEVICE_ID_HARMONIX_WII_RB3_MUSTANG_GUITAR 0x3430 -#define USB_DEVICE_ID_HARMONIX_WII_RB3_SQUIRE_GUITAR 0x3530#define USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_MUSTANG_MODE 0x3438 -#define USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_SQUIRE_MODE 0x3538 +#define USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_SQUIER_MODE 0x3538#define USB_DEVICE_ID_HARMONIX_WII_RB3_KEYBOARD 0x3330#define USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_KEYBOARD_MODE 0x3338
@@ -1331,9 +1330,8 @@#define USB_DEVICE_ID_SONY_PS3_RB_DRUMS 0x0210#define USB_DEVICE_ID_SONY_PS3_RB3_MPA_DRUMS_MODE 0x0218#define USB_DEVICE_ID_SONY_PS3_RB3_MUSTANG_GUITAR 0x2430 -#define USB_DEVICE_ID_SONY_PS3_RB3_SQUIRE_GUITAR 0x2530#define USB_DEVICE_ID_SONY_PS3_RB3_MPA_MUSTANG_MODE 0x2438 -#define USB_DEVICE_ID_SONY_PS3_RB3_MPA_SQUIRE_MODE 0x2538 +#define USB_DEVICE_ID_SONY_PS3_RB3_MPA_SQUIER_MODE 0x2538#define USB_DEVICE_ID_SONY_PS3_RB3_KEYBOARD 0x2330#define USB_DEVICE_ID_SONY_PS3_RB3_MPA_KEYBOARD_MODE 0x2338
drivers/hid/hid-sony.c +2 -6
@@ -2571,11 +2571,9 @@ static const struct hid_device_id sony_devices[] = { .driver_data = INSTRUMENT }, { HID_USB_DEVICE(USB_VENDOR_ID_HARMONIX, USB_DEVICE_ID_HARMONIX_WII_RB3_MUSTANG_GUITAR), .driver_data = INSTRUMENT }, - { HID_USB_DEVICE(USB_VENDOR_ID_HARMONIX, USB_DEVICE_ID_HARMONIX_WII_RB3_SQUIRE_GUITAR), - .driver_data = INSTRUMENT }, { HID_USB_DEVICE(USB_VENDOR_ID_HARMONIX, USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_MUSTANG_MODE), .driver_data = INSTRUMENT }, - { HID_USB_DEVICE(USB_VENDOR_ID_HARMONIX, USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_SQUIRE_MODE), + { HID_USB_DEVICE(USB_VENDOR_ID_HARMONIX, USB_DEVICE_ID_HARMONIX_WII_RB3_MPA_SQUIER_MODE), .driver_data = INSTRUMENT }, { HID_USB_DEVICE(USB_VENDOR_ID_HARMONIX, USB_DEVICE_ID_HARMONIX_WII_RB3_KEYBOARD), .driver_data = INSTRUMENT },
@@ -2591,11 +2589,9 @@ static const struct hid_device_id sony_devices[] = {/* Rock Band 3 PS3 Pro instruments */ { HID_USB_DEVICE(USB_VENDOR_ID_SONY_RHYTHM, USB_DEVICE_ID_SONY_PS3_RB3_MUSTANG_GUITAR), .driver_data = INSTRUMENT | RB3_PS3_PRO_INSTRUMENT }, - { HID_USB_DEVICE(USB_VENDOR_ID_SONY_RHYTHM, USB_DEVICE_ID_SONY_PS3_RB3_SQUIRE_GUITAR), - .driver_data = INSTRUMENT | RB3_PS3_PRO_INSTRUMENT }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY_RHYTHM, USB_DEVICE_ID_SONY_PS3_RB3_MPA_MUSTANG_MODE), .driver_data = INSTRUMENT | RB3_PS3_PRO_INSTRUMENT }, - { HID_USB_DEVICE(USB_VENDOR_ID_SONY_RHYTHM, USB_DEVICE_ID_SONY_PS3_RB3_MPA_SQUIRE_MODE), + { HID_USB_DEVICE(USB_VENDOR_ID_SONY_RHYTHM, USB_DEVICE_ID_SONY_PS3_RB3_MPA_SQUIER_MODE), .driver_data = INSTRUMENT | RB3_PS3_PRO_INSTRUMENT }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY_RHYTHM, USB_DEVICE_ID_SONY_PS3_RB3_KEYBOARD), .driver_data = INSTRUMENT | RB3_PS3_PRO_INSTRUMENT },
Signature · 1 line
2.53.0