diff mbox series

USB: serial: simple: sort entries

Message ID 20230720080049.14032-1-johan@kernel.org
State New
Headers
Series USB: serial: simple: sort entries |

Commit Message

Johan Hovold July 20, 2023, 8 a.m. UTC 
  Sort the defines and device-id entries alphabetically in order to make
it more obvious where new entries should be added.

Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/usb/serial/usb-serial-simple.c | 66 +++++++++++++-------------
 1 file changed, 33 insertions(+), 33 deletions(-)

Comments

Greg KH July 20, 2023, 1:23 p.m. UTC | #1 
On Thu, Jul 20, 2023 at 10:00:49AM +0200, Johan Hovold wrote:
> Sort the defines and device-id entries alphabetically in order to make
> it more obvious where new entries should be added.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Johan Hovold <johan@kernel.org>
> ---
>  drivers/usb/serial/usb-serial-simple.c | 66 +++++++++++++-------------
>  1 file changed, 33 insertions(+), 33 deletions(-)
> 
> diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c
> index 3c552e4b87ce..24b8772a345e 100644
> --- a/drivers/usb/serial/usb-serial-simple.c
> +++ b/drivers/usb/serial/usb-serial-simple.c
> @@ -38,16 +38,6 @@ static struct usb_serial_driver vendor##_device = {		\
>  	{ USB_DEVICE(0x0a21, 0x8001) }	/* MMT-7305WW */
>  DEVICE(carelink, CARELINK_IDS);
>  
> -/* ZIO Motherboard USB driver */
> -#define ZIO_IDS()			\
> -	{ USB_DEVICE(0x1CBE, 0x0103) }
> -DEVICE(zio, ZIO_IDS);
> -
> -/* Funsoft Serial USB driver */
> -#define FUNSOFT_IDS()			\
> -	{ USB_DEVICE(0x1404, 0xcddc) }
> -DEVICE(funsoft, FUNSOFT_IDS);
> -
>  /* Infineon Flashloader driver */
>  #define FLASHLOADER_IDS()		\
>  	{ USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \
> @@ -55,6 +45,11 @@ DEVICE(funsoft, FUNSOFT_IDS);
>  	{ USB_DEVICE(0x8087, 0x0801) }
>  DEVICE(flashloader, FLASHLOADER_IDS);
>  
> +/* Funsoft Serial USB driver */
> +#define FUNSOFT_IDS()			\
> +	{ USB_DEVICE(0x1404, 0xcddc) }
> +DEVICE(funsoft, FUNSOFT_IDS);
> +
>  /* Google Serial USB SubClass */
>  #define GOOGLE_IDS()						\
>  	{ USB_VENDOR_AND_INTERFACE_INFO(0x18d1,			\
> @@ -63,6 +58,11 @@ DEVICE(flashloader, FLASHLOADER_IDS);
>  					0x01) }
>  DEVICE(google, GOOGLE_IDS);
>  
> +/* HP4x (48/49) Generic Serial driver */
> +#define HP4X_IDS()			\
> +	{ USB_DEVICE(0x03f0, 0x0121) }
> +DEVICE(hp4x, HP4X_IDS);
> +
>  /* KAUFMANN RKS+CAN VCP */
>  #define KAUFMANN_IDS()			\
>  	{ USB_DEVICE(0x16d0, 0x0870) }
> @@ -73,11 +73,6 @@ DEVICE(kaufmann, KAUFMANN_IDS);
>  	{ USB_DEVICE(0x1209, 0x8b00) }
>  DEVICE(libtransistor, LIBTRANSISTOR_IDS);
>  
> -/* ViVOpay USB Serial Driver */
> -#define VIVOPAY_IDS()			\
> -	{ USB_DEVICE(0x1d5f, 0x1004) }	/* ViVOpay 8800 */
> -DEVICE(vivopay, VIVOPAY_IDS);
> -
>  /* Motorola USB Phone driver */
>  #define MOTO_IDS()			\
>  	{ USB_DEVICE(0x05c6, 0x3197) },	/* unknown Motorola phone */	\
> @@ -106,10 +101,10 @@ DEVICE(nokia, NOKIA_IDS);
>  	{ USB_DEVICE(0x09d7, 0x0100) }	/* NovAtel FlexPack GPS */
>  DEVICE_N(novatel_gps, NOVATEL_IDS, 3);
>  
> -/* HP4x (48/49) Generic Serial driver */
> -#define HP4X_IDS()			\
> -	{ USB_DEVICE(0x03f0, 0x0121) }
> -DEVICE(hp4x, HP4X_IDS);
> +/* Siemens USB/MPI adapter */
> +#define SIEMENS_IDS()			\
> +	{ USB_DEVICE(0x908, 0x0004) }
> +DEVICE(siemens_mpi, SIEMENS_IDS);
>  
>  /* Suunto ANT+ USB Driver */
>  #define SUUNTO_IDS()			\
> @@ -117,47 +112,52 @@ DEVICE(hp4x, HP4X_IDS);
>  	{ USB_DEVICE(0x0fcf, 0x1009) } /* Dynastream ANT USB-m Stick */
>  DEVICE(suunto, SUUNTO_IDS);
>  
> -/* Siemens USB/MPI adapter */
> -#define SIEMENS_IDS()			\
> -	{ USB_DEVICE(0x908, 0x0004) }
> -DEVICE(siemens_mpi, SIEMENS_IDS);
> +/* ViVOpay USB Serial Driver */
> +#define VIVOPAY_IDS()			\
> +	{ USB_DEVICE(0x1d5f, 0x1004) }	/* ViVOpay 8800 */
> +DEVICE(vivopay, VIVOPAY_IDS);
> +
> +/* ZIO Motherboard USB driver */
> +#define ZIO_IDS()			\
> +	{ USB_DEVICE(0x1CBE, 0x0103) }
> +DEVICE(zio, ZIO_IDS);
>  
>  /* All of the above structures mushed into two lists */
>  static struct usb_serial_driver * const serial_drivers[] = {
>  	&carelink_device,
> -	&zio_device,
> -	&funsoft_device,
>  	&flashloader_device,
> +	&funsoft_device,
>  	&google_device,
> +	&hp4x_device,
>  	&kaufmann_device,
>  	&libtransistor_device,
> -	&vivopay_device,
>  	&moto_modem_device,
>  	&motorola_tetra_device,
>  	&nokia_device,
>  	&novatel_gps_device,
> -	&hp4x_device,
> -	&suunto_device,
>  	&siemens_mpi_device,
> +	&suunto_device,
> +	&vivopay_device,
> +	&zio_device,
>  	NULL
>  };
>  
>  static const struct usb_device_id id_table[] = {
>  	CARELINK_IDS(),
> -	ZIO_IDS(),
> -	FUNSOFT_IDS(),
>  	FLASHLOADER_IDS(),
> +	FUNSOFT_IDS(),
>  	GOOGLE_IDS(),
> +	HP4X_IDS(),
>  	KAUFMANN_IDS(),
>  	LIBTRANSISTOR_IDS(),
> -	VIVOPAY_IDS(),
>  	MOTO_IDS(),
>  	MOTOROLA_TETRA_IDS(),
>  	NOKIA_IDS(),
>  	NOVATEL_IDS(),
> -	HP4X_IDS(),
> -	SUUNTO_IDS(),
>  	SIEMENS_IDS(),
> +	SUUNTO_IDS(),
> +	VIVOPAY_IDS(),
> +	ZIO_IDS(),
>  	{ },
>  };
>  MODULE_DEVICE_TABLE(usb, id_table);
> -- 
> 2.41.0
> 

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold July 20, 2023, 2:45 p.m. UTC | #2 
On Thu, Jul 20, 2023 at 03:23:23PM +0200, Greg Kroah-Hartman wrote:
> On Thu, Jul 20, 2023 at 10:00:49AM +0200, Johan Hovold wrote:
> > Sort the defines and device-id entries alphabetically in order to make
> > it more obvious where new entries should be added.

> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Thanks for the ack. Note that I updated the commit message slightly:

	USB: serial: simple: sort driver entries

	Sort the driver symbols alphabetically in order to make it more obvious
	where new driver entries should be added.

when applying.

Johan
diff mbox series

Patch

diff --git a/drivers/usb/serial/usb-serial-simple.c b/drivers/usb/serial/usb-serial-simple.c
index 3c552e4b87ce..24b8772a345e 100644
--- a/drivers/usb/serial/usb-serial-simple.c
+++ b/drivers/usb/serial/usb-serial-simple.c
@@ -38,16 +38,6 @@  static struct usb_serial_driver vendor##_device = {		\
 	{ USB_DEVICE(0x0a21, 0x8001) }	/* MMT-7305WW */
 DEVICE(carelink, CARELINK_IDS);
 
-/* ZIO Motherboard USB driver */
-#define ZIO_IDS()			\
-	{ USB_DEVICE(0x1CBE, 0x0103) }
-DEVICE(zio, ZIO_IDS);
-
-/* Funsoft Serial USB driver */
-#define FUNSOFT_IDS()			\
-	{ USB_DEVICE(0x1404, 0xcddc) }
-DEVICE(funsoft, FUNSOFT_IDS);
-
 /* Infineon Flashloader driver */
 #define FLASHLOADER_IDS()		\
 	{ USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \
@@ -55,6 +45,11 @@  DEVICE(funsoft, FUNSOFT_IDS);
 	{ USB_DEVICE(0x8087, 0x0801) }
 DEVICE(flashloader, FLASHLOADER_IDS);
 
+/* Funsoft Serial USB driver */
+#define FUNSOFT_IDS()			\
+	{ USB_DEVICE(0x1404, 0xcddc) }
+DEVICE(funsoft, FUNSOFT_IDS);
+
 /* Google Serial USB SubClass */
 #define GOOGLE_IDS()						\
 	{ USB_VENDOR_AND_INTERFACE_INFO(0x18d1,			\
@@ -63,6 +58,11 @@  DEVICE(flashloader, FLASHLOADER_IDS);
 					0x01) }
 DEVICE(google, GOOGLE_IDS);
 
+/* HP4x (48/49) Generic Serial driver */
+#define HP4X_IDS()			\
+	{ USB_DEVICE(0x03f0, 0x0121) }
+DEVICE(hp4x, HP4X_IDS);
+
 /* KAUFMANN RKS+CAN VCP */
 #define KAUFMANN_IDS()			\
 	{ USB_DEVICE(0x16d0, 0x0870) }
@@ -73,11 +73,6 @@  DEVICE(kaufmann, KAUFMANN_IDS);
 	{ USB_DEVICE(0x1209, 0x8b00) }
 DEVICE(libtransistor, LIBTRANSISTOR_IDS);
 
-/* ViVOpay USB Serial Driver */
-#define VIVOPAY_IDS()			\
-	{ USB_DEVICE(0x1d5f, 0x1004) }	/* ViVOpay 8800 */
-DEVICE(vivopay, VIVOPAY_IDS);
-
 /* Motorola USB Phone driver */
 #define MOTO_IDS()			\
 	{ USB_DEVICE(0x05c6, 0x3197) },	/* unknown Motorola phone */	\
@@ -106,10 +101,10 @@  DEVICE(nokia, NOKIA_IDS);
 	{ USB_DEVICE(0x09d7, 0x0100) }	/* NovAtel FlexPack GPS */
 DEVICE_N(novatel_gps, NOVATEL_IDS, 3);
 
-/* HP4x (48/49) Generic Serial driver */
-#define HP4X_IDS()			\
-	{ USB_DEVICE(0x03f0, 0x0121) }
-DEVICE(hp4x, HP4X_IDS);
+/* Siemens USB/MPI adapter */
+#define SIEMENS_IDS()			\
+	{ USB_DEVICE(0x908, 0x0004) }
+DEVICE(siemens_mpi, SIEMENS_IDS);
 
 /* Suunto ANT+ USB Driver */
 #define SUUNTO_IDS()			\
@@ -117,47 +112,52 @@  DEVICE(hp4x, HP4X_IDS);
 	{ USB_DEVICE(0x0fcf, 0x1009) } /* Dynastream ANT USB-m Stick */
 DEVICE(suunto, SUUNTO_IDS);
 
-/* Siemens USB/MPI adapter */
-#define SIEMENS_IDS()			\
-	{ USB_DEVICE(0x908, 0x0004) }
-DEVICE(siemens_mpi, SIEMENS_IDS);
+/* ViVOpay USB Serial Driver */
+#define VIVOPAY_IDS()			\
+	{ USB_DEVICE(0x1d5f, 0x1004) }	/* ViVOpay 8800 */
+DEVICE(vivopay, VIVOPAY_IDS);
+
+/* ZIO Motherboard USB driver */
+#define ZIO_IDS()			\
+	{ USB_DEVICE(0x1CBE, 0x0103) }
+DEVICE(zio, ZIO_IDS);
 
 /* All of the above structures mushed into two lists */
 static struct usb_serial_driver * const serial_drivers[] = {
 	&carelink_device,
-	&zio_device,
-	&funsoft_device,
 	&flashloader_device,
+	&funsoft_device,
 	&google_device,
+	&hp4x_device,
 	&kaufmann_device,
 	&libtransistor_device,
-	&vivopay_device,
 	&moto_modem_device,
 	&motorola_tetra_device,
 	&nokia_device,
 	&novatel_gps_device,
-	&hp4x_device,
-	&suunto_device,
 	&siemens_mpi_device,
+	&suunto_device,
+	&vivopay_device,
+	&zio_device,
 	NULL
 };
 
 static const struct usb_device_id id_table[] = {
 	CARELINK_IDS(),
-	ZIO_IDS(),
-	FUNSOFT_IDS(),
 	FLASHLOADER_IDS(),
+	FUNSOFT_IDS(),
 	GOOGLE_IDS(),
+	HP4X_IDS(),
 	KAUFMANN_IDS(),
 	LIBTRANSISTOR_IDS(),
-	VIVOPAY_IDS(),
 	MOTO_IDS(),
 	MOTOROLA_TETRA_IDS(),
 	NOKIA_IDS(),
 	NOVATEL_IDS(),
-	HP4X_IDS(),
-	SUUNTO_IDS(),
 	SIEMENS_IDS(),
+	SUUNTO_IDS(),
+	VIVOPAY_IDS(),
+	ZIO_IDS(),
 	{ },
 };
 MODULE_DEVICE_TABLE(usb, id_table);