From cfa380bd0ea87594c3ed404258f77b0a969a381e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 25 Nov 2023 15:24:30 +0000 Subject: [PATCH] drop alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch --- ...ove-usb-ids-out-from-device_info-str.patch | 195 ------------------ queue-6.1/series | 1 - ...ove-usb-ids-out-from-device_info-str.patch | 195 ------------------ queue-6.5/series | 1 - ...ove-usb-ids-out-from-device_info-str.patch | 195 ------------------ queue-6.6/series | 1 - 6 files changed, 588 deletions(-) delete mode 100644 queue-6.1/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch delete mode 100644 queue-6.5/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch delete mode 100644 queue-6.6/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch diff --git a/queue-6.1/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch b/queue-6.1/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch deleted file mode 100644 index 2893a4054d1..00000000000 --- a/queue-6.1/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch +++ /dev/null @@ -1,195 +0,0 @@ -From 5d2d8300617cf037fe4c14d31bc4391f674c8cd1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Sep 2023 03:02:16 +0930 -Subject: ALSA: scarlett2: Move USB IDs out from device_info struct - -From: Geoffrey D. Bennett - -[ Upstream commit d98cc489029dba4d99714c2e8ec4f5ba249f6851 ] - -By moving the USB IDs from the device_info struct into -scarlett2_devices[], that will allow for devices with different -USB IDs to share the same device_info. - -Tested-by: Philippe Perrot -Signed-off-by: Geoffrey D. Bennett -Link: https://lore.kernel.org/r/8263368e8d49e6fcebc709817bd82ab79b404468.1694705811.git.g@b4.vu -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin ---- - sound/usb/mixer_scarlett_gen2.c | 63 ++++++++++++--------------------- - 1 file changed, 23 insertions(+), 40 deletions(-) - -diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c -index 9d11bb08667e7..48f5c9b9790dc 100644 ---- a/sound/usb/mixer_scarlett_gen2.c -+++ b/sound/usb/mixer_scarlett_gen2.c -@@ -317,8 +317,6 @@ struct scarlett2_mux_entry { - }; - - struct scarlett2_device_info { -- u32 usb_id; /* USB device identifier */ -- - /* Gen 3 devices have an internal MSD mode switch that needs - * to be disabled in order to access the full functionality of - * the device. -@@ -440,8 +438,6 @@ struct scarlett2_data { - /*** Model-specific data ***/ - - static const struct scarlett2_device_info s6i6_gen2_info = { -- .usb_id = USB_ID(0x1235, 0x8203), -- - .config_set = SCARLETT2_CONFIG_SET_GEN_2, - .level_input_count = 2, - .pad_input_count = 2, -@@ -486,8 +482,6 @@ static const struct scarlett2_device_info s6i6_gen2_info = { - }; - - static const struct scarlett2_device_info s18i8_gen2_info = { -- .usb_id = USB_ID(0x1235, 0x8204), -- - .config_set = SCARLETT2_CONFIG_SET_GEN_2, - .level_input_count = 2, - .pad_input_count = 4, -@@ -535,8 +529,6 @@ static const struct scarlett2_device_info s18i8_gen2_info = { - }; - - static const struct scarlett2_device_info s18i20_gen2_info = { -- .usb_id = USB_ID(0x1235, 0x8201), -- - .config_set = SCARLETT2_CONFIG_SET_GEN_2, - .line_out_hw_vol = 1, - -@@ -589,8 +581,6 @@ static const struct scarlett2_device_info s18i20_gen2_info = { - }; - - static const struct scarlett2_device_info solo_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8211), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_NO_MIXER, - .level_input_count = 1, -@@ -602,8 +592,6 @@ static const struct scarlett2_device_info solo_gen3_info = { - }; - - static const struct scarlett2_device_info s2i2_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8210), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_NO_MIXER, - .level_input_count = 2, -@@ -614,8 +602,6 @@ static const struct scarlett2_device_info s2i2_gen3_info = { - }; - - static const struct scarlett2_device_info s4i4_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8212), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .level_input_count = 2, -@@ -660,8 +646,6 @@ static const struct scarlett2_device_info s4i4_gen3_info = { - }; - - static const struct scarlett2_device_info s8i6_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8213), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .level_input_count = 2, -@@ -713,8 +697,6 @@ static const struct scarlett2_device_info s8i6_gen3_info = { - }; - - static const struct scarlett2_device_info s18i8_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8214), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .line_out_hw_vol = 1, -@@ -783,8 +765,6 @@ static const struct scarlett2_device_info s18i8_gen3_info = { - }; - - static const struct scarlett2_device_info s18i20_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8215), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .line_out_hw_vol = 1, -@@ -848,8 +828,6 @@ static const struct scarlett2_device_info s18i20_gen3_info = { - }; - - static const struct scarlett2_device_info clarett_8pre_info = { -- .usb_id = USB_ID(0x1235, 0x820c), -- - .config_set = SCARLETT2_CONFIG_SET_CLARETT, - .line_out_hw_vol = 1, - .level_input_count = 2, -@@ -902,25 +880,30 @@ static const struct scarlett2_device_info clarett_8pre_info = { - } }, - }; - --static const struct scarlett2_device_info *scarlett2_devices[] = { -+struct scarlett2_device_entry { -+ const u32 usb_id; /* USB device identifier */ -+ const struct scarlett2_device_info *info; -+}; -+ -+static const struct scarlett2_device_entry scarlett2_devices[] = { - /* Supported Gen 2 devices */ -- &s6i6_gen2_info, -- &s18i8_gen2_info, -- &s18i20_gen2_info, -+ { USB_ID(0x1235, 0x8203), &s6i6_gen2_info }, -+ { USB_ID(0x1235, 0x8204), &s18i8_gen2_info }, -+ { USB_ID(0x1235, 0x8201), &s18i20_gen2_info }, - - /* Supported Gen 3 devices */ -- &solo_gen3_info, -- &s2i2_gen3_info, -- &s4i4_gen3_info, -- &s8i6_gen3_info, -- &s18i8_gen3_info, -- &s18i20_gen3_info, -+ { USB_ID(0x1235, 0x8211), &solo_gen3_info }, -+ { USB_ID(0x1235, 0x8210), &s2i2_gen3_info }, -+ { USB_ID(0x1235, 0x8212), &s4i4_gen3_info }, -+ { USB_ID(0x1235, 0x8213), &s8i6_gen3_info }, -+ { USB_ID(0x1235, 0x8214), &s18i8_gen3_info }, -+ { USB_ID(0x1235, 0x8215), &s18i20_gen3_info }, - - /* Supported Clarett+ devices */ -- &clarett_8pre_info, -+ { USB_ID(0x1235, 0x820c), &clarett_8pre_info }, - - /* End of list */ -- NULL -+ { 0, NULL }, - }; - - /* get the starting port index number for a given port type/direction */ -@@ -4072,17 +4055,17 @@ static int scarlett2_init_notify(struct usb_mixer_interface *mixer) - - static int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer) - { -- const struct scarlett2_device_info **info = scarlett2_devices; -+ const struct scarlett2_device_entry *entry = scarlett2_devices; - int err; - -- /* Find device in scarlett2_devices */ -- while (*info && (*info)->usb_id != mixer->chip->usb_id) -- info++; -- if (!*info) -+ /* Find entry in scarlett2_devices */ -+ while (entry->usb_id && entry->usb_id != mixer->chip->usb_id) -+ entry++; -+ if (!entry->usb_id) - return -EINVAL; - - /* Initialise private data */ -- err = scarlett2_init_private(mixer, *info); -+ err = scarlett2_init_private(mixer, entry->info); - if (err < 0) - return err; - --- -2.42.0 - diff --git a/queue-6.1/series b/queue-6.1/series index da3bf967e73..6b929a7342e 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -55,7 +55,6 @@ selftests-efivarfs-create-read-fix-a-resource-leak.patch asoc-soc-card-add-storage-for-pci-ssid.patch asoc-sof-pass-pci-ssid-to-machine-driver.patch crypto-pcrypt-fix-hungtask-for-padata_reset.patch -alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch asoc-sof-ipc4-handle-exception_caught-notification-f.patch rdma-hfi1-use-field_get-to-extract-link-width.patch scsi-hisi_sas-set-debugfs_dir-pointer-to-null-after-.patch diff --git a/queue-6.5/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch b/queue-6.5/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch deleted file mode 100644 index 4a10393c8d1..00000000000 --- a/queue-6.5/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch +++ /dev/null @@ -1,195 +0,0 @@ -From 89fb36f7da74eddb9bdbd9e2ff925bfb31bfd8ff Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Sep 2023 03:02:16 +0930 -Subject: ALSA: scarlett2: Move USB IDs out from device_info struct - -From: Geoffrey D. Bennett - -[ Upstream commit d98cc489029dba4d99714c2e8ec4f5ba249f6851 ] - -By moving the USB IDs from the device_info struct into -scarlett2_devices[], that will allow for devices with different -USB IDs to share the same device_info. - -Tested-by: Philippe Perrot -Signed-off-by: Geoffrey D. Bennett -Link: https://lore.kernel.org/r/8263368e8d49e6fcebc709817bd82ab79b404468.1694705811.git.g@b4.vu -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin ---- - sound/usb/mixer_scarlett_gen2.c | 63 ++++++++++++--------------------- - 1 file changed, 23 insertions(+), 40 deletions(-) - -diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c -index 9d11bb08667e7..48f5c9b9790dc 100644 ---- a/sound/usb/mixer_scarlett_gen2.c -+++ b/sound/usb/mixer_scarlett_gen2.c -@@ -317,8 +317,6 @@ struct scarlett2_mux_entry { - }; - - struct scarlett2_device_info { -- u32 usb_id; /* USB device identifier */ -- - /* Gen 3 devices have an internal MSD mode switch that needs - * to be disabled in order to access the full functionality of - * the device. -@@ -440,8 +438,6 @@ struct scarlett2_data { - /*** Model-specific data ***/ - - static const struct scarlett2_device_info s6i6_gen2_info = { -- .usb_id = USB_ID(0x1235, 0x8203), -- - .config_set = SCARLETT2_CONFIG_SET_GEN_2, - .level_input_count = 2, - .pad_input_count = 2, -@@ -486,8 +482,6 @@ static const struct scarlett2_device_info s6i6_gen2_info = { - }; - - static const struct scarlett2_device_info s18i8_gen2_info = { -- .usb_id = USB_ID(0x1235, 0x8204), -- - .config_set = SCARLETT2_CONFIG_SET_GEN_2, - .level_input_count = 2, - .pad_input_count = 4, -@@ -535,8 +529,6 @@ static const struct scarlett2_device_info s18i8_gen2_info = { - }; - - static const struct scarlett2_device_info s18i20_gen2_info = { -- .usb_id = USB_ID(0x1235, 0x8201), -- - .config_set = SCARLETT2_CONFIG_SET_GEN_2, - .line_out_hw_vol = 1, - -@@ -589,8 +581,6 @@ static const struct scarlett2_device_info s18i20_gen2_info = { - }; - - static const struct scarlett2_device_info solo_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8211), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_NO_MIXER, - .level_input_count = 1, -@@ -602,8 +592,6 @@ static const struct scarlett2_device_info solo_gen3_info = { - }; - - static const struct scarlett2_device_info s2i2_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8210), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_NO_MIXER, - .level_input_count = 2, -@@ -614,8 +602,6 @@ static const struct scarlett2_device_info s2i2_gen3_info = { - }; - - static const struct scarlett2_device_info s4i4_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8212), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .level_input_count = 2, -@@ -660,8 +646,6 @@ static const struct scarlett2_device_info s4i4_gen3_info = { - }; - - static const struct scarlett2_device_info s8i6_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8213), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .level_input_count = 2, -@@ -713,8 +697,6 @@ static const struct scarlett2_device_info s8i6_gen3_info = { - }; - - static const struct scarlett2_device_info s18i8_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8214), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .line_out_hw_vol = 1, -@@ -783,8 +765,6 @@ static const struct scarlett2_device_info s18i8_gen3_info = { - }; - - static const struct scarlett2_device_info s18i20_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8215), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .line_out_hw_vol = 1, -@@ -848,8 +828,6 @@ static const struct scarlett2_device_info s18i20_gen3_info = { - }; - - static const struct scarlett2_device_info clarett_8pre_info = { -- .usb_id = USB_ID(0x1235, 0x820c), -- - .config_set = SCARLETT2_CONFIG_SET_CLARETT, - .line_out_hw_vol = 1, - .level_input_count = 2, -@@ -902,25 +880,30 @@ static const struct scarlett2_device_info clarett_8pre_info = { - } }, - }; - --static const struct scarlett2_device_info *scarlett2_devices[] = { -+struct scarlett2_device_entry { -+ const u32 usb_id; /* USB device identifier */ -+ const struct scarlett2_device_info *info; -+}; -+ -+static const struct scarlett2_device_entry scarlett2_devices[] = { - /* Supported Gen 2 devices */ -- &s6i6_gen2_info, -- &s18i8_gen2_info, -- &s18i20_gen2_info, -+ { USB_ID(0x1235, 0x8203), &s6i6_gen2_info }, -+ { USB_ID(0x1235, 0x8204), &s18i8_gen2_info }, -+ { USB_ID(0x1235, 0x8201), &s18i20_gen2_info }, - - /* Supported Gen 3 devices */ -- &solo_gen3_info, -- &s2i2_gen3_info, -- &s4i4_gen3_info, -- &s8i6_gen3_info, -- &s18i8_gen3_info, -- &s18i20_gen3_info, -+ { USB_ID(0x1235, 0x8211), &solo_gen3_info }, -+ { USB_ID(0x1235, 0x8210), &s2i2_gen3_info }, -+ { USB_ID(0x1235, 0x8212), &s4i4_gen3_info }, -+ { USB_ID(0x1235, 0x8213), &s8i6_gen3_info }, -+ { USB_ID(0x1235, 0x8214), &s18i8_gen3_info }, -+ { USB_ID(0x1235, 0x8215), &s18i20_gen3_info }, - - /* Supported Clarett+ devices */ -- &clarett_8pre_info, -+ { USB_ID(0x1235, 0x820c), &clarett_8pre_info }, - - /* End of list */ -- NULL -+ { 0, NULL }, - }; - - /* get the starting port index number for a given port type/direction */ -@@ -4072,17 +4055,17 @@ static int scarlett2_init_notify(struct usb_mixer_interface *mixer) - - static int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer) - { -- const struct scarlett2_device_info **info = scarlett2_devices; -+ const struct scarlett2_device_entry *entry = scarlett2_devices; - int err; - -- /* Find device in scarlett2_devices */ -- while (*info && (*info)->usb_id != mixer->chip->usb_id) -- info++; -- if (!*info) -+ /* Find entry in scarlett2_devices */ -+ while (entry->usb_id && entry->usb_id != mixer->chip->usb_id) -+ entry++; -+ if (!entry->usb_id) - return -EINVAL; - - /* Initialise private data */ -- err = scarlett2_init_private(mixer, *info); -+ err = scarlett2_init_private(mixer, entry->info); - if (err < 0) - return err; - --- -2.42.0 - diff --git a/queue-6.5/series b/queue-6.5/series index 387a26bcf1e..717958c328f 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -79,7 +79,6 @@ asoc-mediatek-mt8188-mt6359-support-dynamic-pinctrl.patch asoc-soc-card-add-storage-for-pci-ssid.patch asoc-sof-pass-pci-ssid-to-machine-driver.patch crypto-pcrypt-fix-hungtask-for-padata_reset.patch -alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch asoc-sof-ipc4-handle-exception_caught-notification-f.patch rdma-hfi1-use-field_get-to-extract-link-width.patch scsi-hisi_sas-set-debugfs_dir-pointer-to-null-after-.patch diff --git a/queue-6.6/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch b/queue-6.6/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch deleted file mode 100644 index b79979d4d59..00000000000 --- a/queue-6.6/alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch +++ /dev/null @@ -1,195 +0,0 @@ -From 92de4142246fbb7fc42d6c9d3716525889246b07 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 15 Sep 2023 03:02:16 +0930 -Subject: ALSA: scarlett2: Move USB IDs out from device_info struct - -From: Geoffrey D. Bennett - -[ Upstream commit d98cc489029dba4d99714c2e8ec4f5ba249f6851 ] - -By moving the USB IDs from the device_info struct into -scarlett2_devices[], that will allow for devices with different -USB IDs to share the same device_info. - -Tested-by: Philippe Perrot -Signed-off-by: Geoffrey D. Bennett -Link: https://lore.kernel.org/r/8263368e8d49e6fcebc709817bd82ab79b404468.1694705811.git.g@b4.vu -Signed-off-by: Takashi Iwai -Signed-off-by: Sasha Levin ---- - sound/usb/mixer_scarlett_gen2.c | 63 ++++++++++++--------------------- - 1 file changed, 23 insertions(+), 40 deletions(-) - -diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett_gen2.c -index d260be8cb6bc0..606dc6b5cedf9 100644 ---- a/sound/usb/mixer_scarlett_gen2.c -+++ b/sound/usb/mixer_scarlett_gen2.c -@@ -317,8 +317,6 @@ struct scarlett2_mux_entry { - }; - - struct scarlett2_device_info { -- u32 usb_id; /* USB device identifier */ -- - /* Gen 3 devices have an internal MSD mode switch that needs - * to be disabled in order to access the full functionality of - * the device. -@@ -440,8 +438,6 @@ struct scarlett2_data { - /*** Model-specific data ***/ - - static const struct scarlett2_device_info s6i6_gen2_info = { -- .usb_id = USB_ID(0x1235, 0x8203), -- - .config_set = SCARLETT2_CONFIG_SET_GEN_2, - .level_input_count = 2, - .pad_input_count = 2, -@@ -486,8 +482,6 @@ static const struct scarlett2_device_info s6i6_gen2_info = { - }; - - static const struct scarlett2_device_info s18i8_gen2_info = { -- .usb_id = USB_ID(0x1235, 0x8204), -- - .config_set = SCARLETT2_CONFIG_SET_GEN_2, - .level_input_count = 2, - .pad_input_count = 4, -@@ -535,8 +529,6 @@ static const struct scarlett2_device_info s18i8_gen2_info = { - }; - - static const struct scarlett2_device_info s18i20_gen2_info = { -- .usb_id = USB_ID(0x1235, 0x8201), -- - .config_set = SCARLETT2_CONFIG_SET_GEN_2, - .line_out_hw_vol = 1, - -@@ -589,8 +581,6 @@ static const struct scarlett2_device_info s18i20_gen2_info = { - }; - - static const struct scarlett2_device_info solo_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8211), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_NO_MIXER, - .level_input_count = 1, -@@ -602,8 +592,6 @@ static const struct scarlett2_device_info solo_gen3_info = { - }; - - static const struct scarlett2_device_info s2i2_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8210), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_NO_MIXER, - .level_input_count = 2, -@@ -614,8 +602,6 @@ static const struct scarlett2_device_info s2i2_gen3_info = { - }; - - static const struct scarlett2_device_info s4i4_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8212), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .level_input_count = 2, -@@ -660,8 +646,6 @@ static const struct scarlett2_device_info s4i4_gen3_info = { - }; - - static const struct scarlett2_device_info s8i6_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8213), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .level_input_count = 2, -@@ -713,8 +697,6 @@ static const struct scarlett2_device_info s8i6_gen3_info = { - }; - - static const struct scarlett2_device_info s18i8_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8214), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .line_out_hw_vol = 1, -@@ -783,8 +765,6 @@ static const struct scarlett2_device_info s18i8_gen3_info = { - }; - - static const struct scarlett2_device_info s18i20_gen3_info = { -- .usb_id = USB_ID(0x1235, 0x8215), -- - .has_msd_mode = 1, - .config_set = SCARLETT2_CONFIG_SET_GEN_3, - .line_out_hw_vol = 1, -@@ -848,8 +828,6 @@ static const struct scarlett2_device_info s18i20_gen3_info = { - }; - - static const struct scarlett2_device_info clarett_8pre_info = { -- .usb_id = USB_ID(0x1235, 0x820c), -- - .config_set = SCARLETT2_CONFIG_SET_CLARETT, - .line_out_hw_vol = 1, - .level_input_count = 2, -@@ -902,25 +880,30 @@ static const struct scarlett2_device_info clarett_8pre_info = { - } }, - }; - --static const struct scarlett2_device_info *scarlett2_devices[] = { -+struct scarlett2_device_entry { -+ const u32 usb_id; /* USB device identifier */ -+ const struct scarlett2_device_info *info; -+}; -+ -+static const struct scarlett2_device_entry scarlett2_devices[] = { - /* Supported Gen 2 devices */ -- &s6i6_gen2_info, -- &s18i8_gen2_info, -- &s18i20_gen2_info, -+ { USB_ID(0x1235, 0x8203), &s6i6_gen2_info }, -+ { USB_ID(0x1235, 0x8204), &s18i8_gen2_info }, -+ { USB_ID(0x1235, 0x8201), &s18i20_gen2_info }, - - /* Supported Gen 3 devices */ -- &solo_gen3_info, -- &s2i2_gen3_info, -- &s4i4_gen3_info, -- &s8i6_gen3_info, -- &s18i8_gen3_info, -- &s18i20_gen3_info, -+ { USB_ID(0x1235, 0x8211), &solo_gen3_info }, -+ { USB_ID(0x1235, 0x8210), &s2i2_gen3_info }, -+ { USB_ID(0x1235, 0x8212), &s4i4_gen3_info }, -+ { USB_ID(0x1235, 0x8213), &s8i6_gen3_info }, -+ { USB_ID(0x1235, 0x8214), &s18i8_gen3_info }, -+ { USB_ID(0x1235, 0x8215), &s18i20_gen3_info }, - - /* Supported Clarett+ devices */ -- &clarett_8pre_info, -+ { USB_ID(0x1235, 0x820c), &clarett_8pre_info }, - - /* End of list */ -- NULL -+ { 0, NULL }, - }; - - /* get the starting port index number for a given port type/direction */ -@@ -4072,17 +4055,17 @@ static int scarlett2_init_notify(struct usb_mixer_interface *mixer) - - static int snd_scarlett_gen2_controls_create(struct usb_mixer_interface *mixer) - { -- const struct scarlett2_device_info **info = scarlett2_devices; -+ const struct scarlett2_device_entry *entry = scarlett2_devices; - int err; - -- /* Find device in scarlett2_devices */ -- while (*info && (*info)->usb_id != mixer->chip->usb_id) -- info++; -- if (!*info) -+ /* Find entry in scarlett2_devices */ -+ while (entry->usb_id && entry->usb_id != mixer->chip->usb_id) -+ entry++; -+ if (!entry->usb_id) - return -EINVAL; - - /* Initialise private data */ -- err = scarlett2_init_private(mixer, *info); -+ err = scarlett2_init_private(mixer, entry->info); - if (err < 0) - return err; - --- -2.42.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 90491feaa61..90dcfb6ed2e 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -85,7 +85,6 @@ asoc-sof-pass-pci-ssid-to-machine-driver.patch asoc-intel-sof_sdw-copy-pci-ssid-to-struct-snd_soc_c.patch asoc-cs35l56-use-pci-ssid-as-the-firmware-uid.patch crypto-pcrypt-fix-hungtask-for-padata_reset.patch -alsa-scarlett2-move-usb-ids-out-from-device_info-str.patch asoc-sof-ipc4-handle-exception_caught-notification-f.patch rdma-hfi1-use-field_get-to-extract-link-width.patch scsi-hisi_sas-set-debugfs_dir-pointer-to-null-after-.patch -- 2.47.3