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

USB misc: 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 9052127f

drivers/usb/misc/adutux.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ MODULE_PARM_DESC(debug, "Debug enabled or not"); 
#define ADU_PRODUCT_ID 0x0064



/* table of devices that work with this driver */

static struct usb_device_id device_table [] = {

static const struct usb_device_id device_table[] = {

	{ USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID) },		/* ADU100 */

	{ USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID+20) }, 	/* ADU120 */

	{ USB_DEVICE(ADU_VENDOR_ID, ADU_PRODUCT_ID+30) }, 	/* ADU130 */

drivers/usb/misc/appledisplay.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
	.bInterfaceProtocol = 0x00



/* table of devices that work with this driver */

static struct usb_device_id appledisplay_table [] = {

static const struct usb_device_id appledisplay_table[] = {

	{ APPLEDISPLAY_DEVICE(0x9218) },

	{ APPLEDISPLAY_DEVICE(0x9219) },

	{ APPLEDISPLAY_DEVICE(0x921c) },

drivers/usb/misc/berry_charge.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int pearl_dual_mode = 1; 
	if (debug)						\

		dev_printk(KERN_DEBUG , dev , format , ## arg)



static struct usb_device_id id_table [] = {

static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(RIM_VENDOR, BLACKBERRY) },

	{ USB_DEVICE(RIM_VENDOR, BLACKBERRY_PEARL) },

	{ USB_DEVICE(RIM_VENDOR, BLACKBERRY_PEARL_DUAL) },

drivers/usb/misc/cypress_cy7c63.c

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




/* table of devices that work with this driver */

static struct usb_device_id cypress_table [] = {

static const struct usb_device_id cypress_table[] = {

	{ USB_DEVICE(CYPRESS_VENDOR_ID, CYPRESS_PRODUCT_ID) },

	{ }

};

drivers/usb/misc/cytherm.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define USB_SKEL_VENDOR_ID	0x04b4

#define USB_SKEL_PRODUCT_ID	0x0002



static struct usb_device_id id_table [] = {

static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(USB_SKEL_VENDOR_ID, USB_SKEL_PRODUCT_ID) },

	{ }

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE