ALSA: scarlett2: Rename scarlett_gen2 to scarlett2

This driver was originally developed for the Focusrite Scarlett Gen 2
series. Since then Focusrite have used a similar protocol for their
Gen 3, Gen 4, Clarett USB, Clarett+, and Vocaster series.

Let's call this common protocol the "Scarlett 2 Protocol" and rename
the driver to scarlett2 to not imply that it is restricted to Gen 2
series devices.

Signed-off-by: Geoffrey D. Bennett <g@b4.vu>
Link: https://lore.kernel.org/r/e1ad7f69a1e20cdb39094164504389160c1a0a0b.1698342632.git.g@b4.vu
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/MAINTAINERS b/MAINTAINERS
index 0495c2644698cc777eb5826ce38cd3cf7be79200..0cabc58100f4f40d66a61d5371f4826139ba5f81 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8126,7 +8126,7 @@ M:        Geoffrey D. Bennett <g@b4.vu>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
-F:     sound/usb/mixer_scarlett_gen2.c
+F:     sound/usb/mixer_scarlett2.c
 
 FORCEDETH GIGABIT ETHERNET DRIVER
 M:     Rain River <rain.1986.08.12@gmail.com>

diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index db5ff76d0e61f901bf5ca1f74a82a35385db9862..8c657c2753c84f0f36f5a305de731f85e4d7d806 100644 (file)
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -12,7 +12,7 @@ snd-usb-audio-objs :=         card.o \
                        mixer.o \
                        mixer_quirks.o \
                        mixer_scarlett.o \
-                       mixer_scarlett_gen2.o \
+                       mixer_scarlett2.o \
                        mixer_us16x08.o \
                        mixer_s1810c.o \
                        pcm.o \

diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index ac521b71cb57106eac37e97f9f0742f105236ae0..898bc3baca7b994ef202e80ecbff93288ddc7bba 100644 (file)
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -33,7 +33,7 @@
 #include "mixer.h"
 #include "mixer_quirks.h"
 #include "mixer_scarlett.h"
-#include "mixer_scarlett_gen2.h"
+#include "mixer_scarlett2.h"
 #include "mixer_us16x08.h"
 #include "mixer_s1810c.h"
 #include "helper.h"
@@ -3426,7 +3426,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
        case USB_ID(0x1235, 0x820a): /* Focusrite Clarett+ 2Pre */
        case USB_ID(0x1235, 0x820b): /* Focusrite Clarett+ 4Pre */
        case USB_ID(0x1235, 0x820c): /* Focusrite Clarett+ 8Pre */
-               err = snd_scarlett_gen2_init(mixer);
+               err = snd_scarlett2_init(mixer);
                break;
 
        case USB_ID(0x041e, 0x323b): /* Creative Sound Blaster E1 */

diff --git a/sound/usb/mixer_scarlett_gen2.c b/sound/usb/mixer_scarlett2.c
similarity index 99%
rename from sound/usb/mixer_scarlett_gen2.c
rename to sound/usb/mixer_scarlett2.c
index 7c865382cca758587118651e1657eee1293a405d..d003a61487f3ac9aa7c415f11cd22e758695838f 100644 (file)
--- a/sound/usb/mixer_scarlett_gen2.c
+++ b/sound/usb/mixer_scarlett2.c
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- *   Focusrite Scarlett Gen 2/3 and Clarett USB/Clarett+ Driver for ALSA
+ *   Focusrite Scarlett 2 Protocol Driver for ALSA
+ *   (including Scarlett 2nd Gen, 3rd Gen, Clarett USB, and Clarett+
+ *   series products)
  *
  *   Supported models:
  *   - 6i6/18i8/18i20 Gen 2
@@ -149,7 +151,7 @@
 #include "mixer.h"
 #include "helper.h"
 
-#include "mixer_scarlett_gen2.h"
+#include "mixer_scarlett2.h"
 
 /* device_setup value to allow turning MSD mode back on */
 #define SCARLETT2_MSD_ENABLE 0x02
@@ -4174,7 +4176,7 @@ static const struct scarlett2_device_entry *get_scarlett2_device_entry(
        return entry;
 }
 
-static int snd_scarlett_gen2_controls_create(
+static int snd_scarlett2_controls_create(
        struct usb_mixer_interface *mixer,
        const struct scarlett2_device_entry *entry)
 {
@@ -4262,7 +4264,7 @@ static int snd_scarlett_gen2_controls_create(
        return 0;
 }
 
-int snd_scarlett_gen2_init(struct usb_mixer_interface *mixer)
+int snd_scarlett2_init(struct usb_mixer_interface *mixer)
 {
        struct snd_usb_audio *chip = mixer->chip;
        const struct scarlett2_device_entry *entry;
@@ -4301,7 +4303,7 @@ int snd_scarlett_gen2_init(struct usb_mixer_interface *mixer)
                entry->series_name,
                USB_ID_PRODUCT(chip->usb_id));
 
-       err = snd_scarlett_gen2_controls_create(mixer, entry);
+       err = snd_scarlett2_controls_create(mixer, entry);
        if (err < 0)
                usb_audio_err(mixer->chip,
                              "Error initialising %s Mixer Driver: %d",

diff --git a/sound/usb/mixer_scarlett2.h b/sound/usb/mixer_scarlett2.h
new file mode 100644 (file)
index 0000000..d209362
--- /dev/null
+++ b/sound/usb/mixer_scarlett2.h
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __USB_MIXER_SCARLETT2_H
+#define __USB_MIXER_SCARLETT2_H
+
+int snd_scarlett2_init(struct usb_mixer_interface *mixer);
+
+#endif /* __USB_MIXER_SCARLETT2_H */

diff --git a/sound/usb/mixer_scarlett_gen2.h b/sound/usb/mixer_scarlett_gen2.h
deleted file mode 100644 (file)
index 668c6b0..0000000
--- a/sound/usb/mixer_scarlett_gen2.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __USB_MIXER_SCARLETT_GEN2_H
-#define __USB_MIXER_SCARLETT_GEN2_H
-
-int snd_scarlett_gen2_init(struct usb_mixer_interface *mixer);
-
-#endif /* __USB_MIXER_SCARLETT_GEN2_H */