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: Németh Márton <nm127@freemail.hu> Cc: Julia Lawall <julia@diku.dk> Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
6ef4852b13
commit
7d40d7e85a
@@ -125,7 +125,7 @@ struct keyspan_pda_private {
|
||||
#define ENTREGRA_VENDOR_ID 0x1645
|
||||
#define ENTREGRA_FAKE_ID 0x8093
|
||||
|
||||
static struct usb_device_id id_table_combined [] = {
|
||||
static const struct usb_device_id id_table_combined[] = {
|
||||
#ifdef KEYSPAN
|
||||
{ USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_FAKE_ID) },
|
||||
#endif
|
||||
@@ -147,20 +147,20 @@ static struct usb_driver keyspan_pda_driver = {
|
||||
.no_dynamic_id = 1,
|
||||
};
|
||||
|
||||
static struct usb_device_id id_table_std [] = {
|
||||
static const struct usb_device_id id_table_std[] = {
|
||||
{ USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_ID) },
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
|
||||
#ifdef KEYSPAN
|
||||
static struct usb_device_id id_table_fake [] = {
|
||||
static const struct usb_device_id id_table_fake[] = {
|
||||
{ USB_DEVICE(KEYSPAN_VENDOR_ID, KEYSPAN_PDA_FAKE_ID) },
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
#endif
|
||||
|
||||
#ifdef XIRCOM
|
||||
static struct usb_device_id id_table_fake_xircom [] = {
|
||||
static const struct usb_device_id id_table_fake_xircom[] = {
|
||||
{ USB_DEVICE(XIRCOM_VENDOR_ID, XIRCOM_FAKE_ID) },
|
||||
{ USB_DEVICE(ENTREGRA_VENDOR_ID, ENTREGRA_FAKE_ID) },
|
||||
{ }
|
||||
|
Reference in New Issue
Block a user