diff mbox series

USB: ftdi_sio: Actisense PIDs constant Names

Message ID AS8PR10MB4424F8DB8AE222C7075514FAFA96A@AS8PR10MB4424.EURPRD10.PROD.OUTLOOK.COM (mailing list archive)
State Accepted
Commit 513d88a88e0203188a38f4647dd08170aebd85df
Headers show
Series USB: ftdi_sio: Actisense PIDs constant Names | expand

Commit Message

Mark Glover Dec. 20, 2023, 11:17 a.m. UTC 
[This patch] changes the constant names for unused USB PIDs (product identifiers) to reflect the new products now using the PIDs.

Signed-off-by: Mark Glover <mark.glover@actisense.com>

Comments

Greg KH Dec. 20, 2023, 1:26 p.m. UTC | #1 
On Wed, Dec 20, 2023 at 11:17:40AM +0000, Mark Glover wrote:
> [This patch] changes the constant names for unused USB PIDs (product identifiers) to reflect the new products now using the PIDs.

No need for "[This patch]", right?

Also, can you wrap your lines at 72 columns?

thanks,

greg k-h
Mark Glover Dec. 20, 2023, 1:57 p.m. UTC | #2 
This changes the constant names for unused USB PIDs (product identifiers)
to reflect the new products now using the PIDs.

Signed-off-by: Mark Glover <mark.glover@actisense.com>

diff -urN linux-6.6.4/drivers/usb/serial/ftdi_sio.c linux/drivers/usb/serial/ftdi_sio.c
--- linux-6.6.4/drivers/usb/serial/ftdi_sio.c	2023-12-03 06:33:10.000000000 +0000
+++ linux/drivers/usb/serial/ftdi_sio.c	2023-12-12 10:39:51.157327241 +0000
@@ -1033,9 +1033,9 @@
 	{ USB_DEVICE(FTDI_VID, ACTISENSE_USG_PID) },
 	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGT_PID) },
 	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGW_PID) },
-	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AC_PID) },
-	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AD_PID) },
-	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AE_PID) },
+	{ USB_DEVICE(FTDI_VID, ACTISENSE_UID_PID) },
+	{ USB_DEVICE(FTDI_VID, ACTISENSE_USA_PID) },
+	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGX_PID) },
 	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AF_PID) },
 	{ USB_DEVICE(FTDI_VID, CHETCO_SEAGAUGE_PID) },
 	{ USB_DEVICE(FTDI_VID, CHETCO_SEASWITCH_PID) }, 

diff -urN linux-6.6.4/drivers/usb/serial/ftdi_sio_ids.h linux/drivers/usb/serial/ftdi_sio_ids.h
--- linux-6.6.4/drivers/usb/serial/ftdi_sio_ids.h	2023-12-03 06:33:10.000000000 +0000
+++ linux/drivers/usb/serial/ftdi_sio_ids.h	2023-12-12 10:36:37.295990528 +0000
@@ -1568,9 +1568,9 @@
 #define ACTISENSE_USG_PID		0xD9A9 /* USG USB Serial Adapter */
 #define ACTISENSE_NGT_PID		0xD9AA /* NGT NMEA2000 Interface */
 #define ACTISENSE_NGW_PID		0xD9AB /* NGW NMEA2000 Gateway */
-#define ACTISENSE_D9AC_PID		0xD9AC /* Actisense Reserved */
-#define ACTISENSE_D9AD_PID		0xD9AD /* Actisense Reserved */
-#define ACTISENSE_D9AE_PID		0xD9AE /* Actisense Reserved */
+#define ACTISENSE_UID_PID		0xD9AC /* USB Isolating Device */
+#define ACTISENSE_USA_PID		0xD9AD /* USB to Serial Adapter */
+#define ACTISENSE_NGX_PID		0xD9AE /* NGX NMEA2000 Gateway */
 #define ACTISENSE_D9AF_PID		0xD9AF /* Actisense Reserved */
 #define CHETCO_SEAGAUGE_PID		0xA548 /* SeaGauge USB Adapter */
 #define CHETCO_SEASWITCH_PID		0xA549 /* SeaSwitch USB Adapter */
Johan Hovold Dec. 21, 2023, 8:14 a.m. UTC | #3 
On Wed, Dec 20, 2023 at 01:57:40PM +0000, Mark Glover wrote:
> This changes the constant names for unused USB PIDs (product identifiers)
> to reflect the new products now using the PIDs.

Commit messages should use imperative mode (see the process
documentation) so I changed this to:

	Update the constant names for unused USB PIDs (product
	identifiers) to reflect the new products now using the PIDs.

and similar in the commit summary (Subject) where I also added the
missing common prefix ("USB: serial: ").

And when revising patches you should indicate that in Subject (e.g.
"[PATCH v2]") and include a short changelog below the '---' line (which
is missing below, but goes below the SoB).

Next time, try using git format-patch to generate the patch.

> Signed-off-by: Mark Glover <mark.glover@actisense.com>
> 
> diff -urN linux-6.6.4/drivers/usb/serial/ftdi_sio.c linux/drivers/usb/serial/ftdi_sio.c
> --- linux-6.6.4/drivers/usb/serial/ftdi_sio.c	2023-12-03 06:33:10.000000000 +0000
> +++ linux/drivers/usb/serial/ftdi_sio.c	2023-12-12 10:39:51.157327241 +0000
> @@ -1033,9 +1033,9 @@
>  	{ USB_DEVICE(FTDI_VID, ACTISENSE_USG_PID) },
>  	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGT_PID) },
>  	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGW_PID) },
> -	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AC_PID) },
> -	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AD_PID) },
> -	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AE_PID) },
> +	{ USB_DEVICE(FTDI_VID, ACTISENSE_UID_PID) },
> +	{ USB_DEVICE(FTDI_VID, ACTISENSE_USA_PID) },
> +	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGX_PID) },
>  	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AF_PID) },
>  	{ USB_DEVICE(FTDI_VID, CHETCO_SEAGAUGE_PID) },
>  	{ USB_DEVICE(FTDI_VID, CHETCO_SEASWITCH_PID) }, 

For some reason that I was not able to determine, this hunk did not
apply to mainline despite that there hasn't really been any changes to
the surrounding code since 6.6.4 (which you used to generate this
patch).

I fixed it up manually this time. End result is here:

	https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git/commit/?h=usb-linus&id=513d88a88e0203188a38f4647dd08170aebd85df

Johan
diff mbox series

Patch

diff -urN linux-6.6.4/drivers/usb/serial/ftdi_sio.c linux/drivers/usb/serial/ftdi_sio.c
--- linux-6.6.4/drivers/usb/serial/ftdi_sio.c	2023-12-03 06:33:10.000000000 +0000
+++ linux/drivers/usb/serial/ftdi_sio.c	2023-12-12 10:39:51.157327241 +0000
@@ -1033,9 +1033,9 @@ 
 	{ USB_DEVICE(FTDI_VID, ACTISENSE_USG_PID) },
 	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGT_PID) },
 	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGW_PID) },
-	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AC_PID) },
-	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AD_PID) },
-	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AE_PID) },
+	{ USB_DEVICE(FTDI_VID, ACTISENSE_UID_PID) },
+	{ USB_DEVICE(FTDI_VID, ACTISENSE_USA_PID) },
+	{ USB_DEVICE(FTDI_VID, ACTISENSE_NGX_PID) },
 	{ USB_DEVICE(FTDI_VID, ACTISENSE_D9AF_PID) },
 	{ USB_DEVICE(FTDI_VID, CHETCO_SEAGAUGE_PID) },
 	{ USB_DEVICE(FTDI_VID, CHETCO_SEASWITCH_PID) },
diff -urN linux-6.6.4/drivers/usb/serial/ftdi_sio_ids.h linux/drivers/usb/serial/ftdi_sio_ids.h
--- linux-6.6.4/drivers/usb/serial/ftdi_sio_ids.h	2023-12-03 06:33:10.000000000 +0000
+++ linux/drivers/usb/serial/ftdi_sio_ids.h	2023-12-12 10:36:37.295990528 +0000
@@ -1568,9 +1568,9 @@ 
 #define ACTISENSE_USG_PID		0xD9A9 /* USG USB Serial Adapter */
 #define ACTISENSE_NGT_PID		0xD9AA /* NGT NMEA2000 Interface */
 #define ACTISENSE_NGW_PID		0xD9AB /* NGW NMEA2000 Gateway */
-#define ACTISENSE_D9AC_PID		0xD9AC /* Actisense Reserved */
-#define ACTISENSE_D9AD_PID		0xD9AD /* Actisense Reserved */
-#define ACTISENSE_D9AE_PID		0xD9AE /* Actisense Reserved */
+#define ACTISENSE_UID_PID		0xD9AC /* USB Isolating Device */
+#define ACTISENSE_USA_PID		0xD9AD /* USB to Serial Adapter */
+#define ACTISENSE_NGX_PID		0xD9AE /* NGX NMEA2000 Gateway */
 #define ACTISENSE_D9AF_PID		0xD9AF /* Actisense Reserved */
 #define CHETCO_SEAGAUGE_PID		0xA548 /* SeaGauge USB Adapter */
 #define CHETCO_SEASWITCH_PID		0xA549 /* SeaSwitch USB Adapter */