Skip to contentSkip to conversation

USB hub: make USB device id constant

PATCH New Németh Márton 1 participant 1 message Jan 10, 2010 USB

lore
Share & tools
lore
#0 lore raw

PATCH 6/9 USB hub: make USB device id constant

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>

---

drivers/usb/core/hub.c 2010-01-08 17:20:19.000000000 +0100 renamed from drivers/usb/core/hub.c 2010-01-07 19:08:47.000000000 +0100 +1 -1
diff -u -p a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
@@ -3442,7 +3442,7 @@ static int hub_thread(void *__unused)
 	return 0;
 }
 
-static struct usb_device_id hub_id_table [] = {
+static const struct usb_device_id hub_id_table[] = {
     { .match_flags = USB_DEVICE_ID_MATCH_DEV_CLASS,
       .bDeviceClass = USB_CLASS_HUB},
     { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,