From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D556EB64DC for ; Thu, 20 Jul 2023 13:23:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231837AbjGTNXa (ORCPT ); Thu, 20 Jul 2023 09:23:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231279AbjGTNX2 (ORCPT ); Thu, 20 Jul 2023 09:23:28 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E22F410F5; Thu, 20 Jul 2023 06:23:27 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7ADC361A73; Thu, 20 Jul 2023 13:23:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53487C433C8; Thu, 20 Jul 2023 13:23:26 +0000 (UTC) Date: Thu, 20 Jul 2023 15:23:23 +0200 From: Greg KH To: Johan Hovold Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] USB: serial: simple: sort entries Message-ID: <2023072016-answering-easing-ad6b@gregkh> References: <20230720080049.14032-1-johan@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230720080049.14032-1-johan@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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