Commit 7d40d7e8 authored by Németh Márton's avatar Németh Márton Committed by Greg Kroah-Hartman
Browse files

USB serial: make USB device id constant 

The id_table field of the struct usb_device_id is constant in <linux/usb.h>
so it is worth to make the initialization data also constant.

The semantic match that finds this kind of pattern is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@r@
disable decl_init,const_decl_init;
identifier I1, I2, x;
@@
	struct I1 {
	  ...
	  const struct I2 *x;
	  ...
	};
@s@
identifier r.I1, y;
identifier r.x, E;
@@
	struct I1 y = {
	  .x = E,
	};
@c@
identifier r.I2;
identifier s.E;
@@
	const struct I2 E[] = ... ;
@depends on !c@
identifier r.I2;
identifier s.E;
@@
+	const
	struct I2 E[] = ...;
// </smpl>

Signed-off-by: default avatarNémeth Márton <nm127@freemail.hu>
Cc: Julia Lawall <julia@diku.dk>
Cc: cocci@diku.dk
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6ef4852b

drivers/usb/serial/aircable.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int debug; 
#define DRIVER_DESC "AIRcable USB Driver"



/* ID table that will be registered with USB core */

static struct usb_device_id id_table [] = {

static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(AIRCABLE_VID, AIRCABLE_USB_PID) },

	{ },

};

drivers/usb/serial/ark3116.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static int debug; 
/* usb timeout of 1 second */

#define ARK_TIMEOUT (1*HZ)



static struct usb_device_id id_table [] = {

static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(0x6547, 0x0232) },

	{ USB_DEVICE(0x18ec, 0x3118) },		/* USB to IrDA adapter */

	{ },

drivers/usb/serial/belkin_sa.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static int belkin_sa_tiocmset(struct tty_struct *tty, struct file *file, 
					unsigned int set, unsigned int clear);





static struct usb_device_id id_table_combined [] = {

static const struct usb_device_id id_table_combined[] = {

	{ USB_DEVICE(BELKIN_SA_VID, BELKIN_SA_PID) },

	{ USB_DEVICE(BELKIN_OLD_VID, BELKIN_OLD_PID) },

	{ USB_DEVICE(PERACOM_VID, PERACOM_PID) },

drivers/usb/serial/ch341.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 


static int debug;



static struct usb_device_id id_table [] = {

static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(0x4348, 0x5523) },

	{ USB_DEVICE(0x1a86, 0x7523) },

	{ },

drivers/usb/serial/cp210x.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int cp210x_carrier_raised(struct usb_serial_port *p); 


static int debug;



static struct usb_device_id id_table [] = {

static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(0x0471, 0x066A) }, /* AKTAKOM ACE-1001 cable */

	{ USB_DEVICE(0x0489, 0xE000) }, /* Pirelli Broadband S.p.A, DP-L10 SIP/GSM Mobile */

	{ USB_DEVICE(0x0745, 0x1000) }, /* CipherLab USB CCD Barcode Scanner 1000 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE