diff options
author | Németh Márton <nm127@freemail.hu> | 2010-01-10 09:34:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:54:16 -0500 |
commit | 7d40d7e85a25e01948bcb4dc3eda1355af318337 (patch) | |
tree | c526b807220477c60c601ca85fa5a05a75305f42 /drivers/usb/serial/whiteheat.c | |
parent | 6ef4852b1326301f6e9657e99b2c3221be1a3a44 (diff) |
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>
Diffstat (limited to 'drivers/usb/serial/whiteheat.c')
-rw-r--r-- | drivers/usb/serial/whiteheat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 1093d2eb046a..e89e0d589eb6 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c | |||
@@ -111,17 +111,17 @@ static int debug; | |||
111 | separate ID tables, and then a third table that combines them | 111 | separate ID tables, and then a third table that combines them |
112 | just for the purpose of exporting the autoloading information. | 112 | just for the purpose of exporting the autoloading information. |
113 | */ | 113 | */ |
114 | static struct usb_device_id id_table_std [] = { | 114 | static const struct usb_device_id id_table_std[] = { |
115 | { USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_WHITE_HEAT_ID) }, | 115 | { USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_WHITE_HEAT_ID) }, |
116 | { } /* Terminating entry */ | 116 | { } /* Terminating entry */ |
117 | }; | 117 | }; |
118 | 118 | ||
119 | static struct usb_device_id id_table_prerenumeration [] = { | 119 | static const struct usb_device_id id_table_prerenumeration[] = { |
120 | { USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_FAKE_WHITE_HEAT_ID) }, | 120 | { USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_FAKE_WHITE_HEAT_ID) }, |
121 | { } /* Terminating entry */ | 121 | { } /* Terminating entry */ |
122 | }; | 122 | }; |
123 | 123 | ||
124 | static struct usb_device_id id_table_combined [] = { | 124 | static const struct usb_device_id id_table_combined[] = { |
125 | { USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_WHITE_HEAT_ID) }, | 125 | { USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_WHITE_HEAT_ID) }, |
126 | { USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_FAKE_WHITE_HEAT_ID) }, | 126 | { USB_DEVICE(CONNECT_TECH_VENDOR_ID, CONNECT_TECH_FAKE_WHITE_HEAT_ID) }, |
127 | { } /* Terminating entry */ | 127 | { } /* Terminating entry */ |