From: Márton Németh <[email protected]>

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: Márton Németh <[email protected]>
Cc: Julia Lawall <[email protected]>
Cc: [email protected]
---
diff -u -p a/drivers/input/tablet/gtco.c b/drivers/input/tablet/gtco.c
--- a/drivers/input/tablet/gtco.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/input/tablet/gtco.c 2010-01-08 19:11:02.000000000 +0100
@@ -92,7 +92,7 @@ Scott Hill [email protected]
 /* DATA STRUCTURES */

 /* Device table */
-static struct usb_device_id gtco_usbid_table [] = {
+static const struct usb_device_id gtco_usbid_table[] = {
        { USB_DEVICE(VENDOR_ID_GTCO, PID_400) },
        { USB_DEVICE(VENDOR_ID_GTCO, PID_401) },
        { USB_DEVICE(VENDOR_ID_GTCO, PID_1000) },
diff -u -p a/drivers/input/touchscreen/usbtouchscreen.c 
b/drivers/input/touchscreen/usbtouchscreen.c
--- a/drivers/input/touchscreen/usbtouchscreen.c 2010-01-07 19:08:40.000000000 
+0100
+++ b/drivers/input/touchscreen/usbtouchscreen.c 2010-01-08 19:17:10.000000000 
+0100
@@ -144,7 +144,7 @@ enum {
        .bInterfaceClass = USB_INTERFACE_CLASS_HID, \
        .bInterfaceProtocol = USB_INTERFACE_PROTOCOL_MOUSE

-static struct usb_device_id usbtouch_devices[] = {
+static const struct usb_device_id usbtouch_devices[] = {
 #ifdef CONFIG_TOUCHSCREEN_USB_EGALAX
        /* ignore the HID capable devices, handled by usbhid */
        {USB_DEVICE_HID_CLASS(0x0eef, 0x0001), .driver_info = DEVTYPE_IGNORE},
_______________________________________________
Cocci mailing list
[email protected]
http://lists.diku.dk/mailman/listinfo/cocci
(Web access from inside DIKUs LAN only)

Reply via email to