[PATCH] HID: sony: fix incorrect Squier name and remove non-existent device

[Rosalie Wanders]

This patch fixes the Squier device name and removes a non-existent
device from hid-sony.

Co-developed-by: Sanjay Govind <sanjay.govind9@xxxxxxxxx>
Signed-off-by: Sanjay Govind <sanjay.govind9@xxxxxxxxx>
Signed-off-by: Rosalie Wanders <rosalie@xxxxxxxxxxx>
---
 drivers/hid/hid-ids.h  | 6 ++----
 drivers/hid/hid-sony.c | 8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 0d78904ee802..f3946932dd95 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -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
 
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
index f72201b30ac6..74a160ec4d08 100644
--- a/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@ -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 },
-- 
2.53.0