[PATCH 2/5] block: make USB device id constant

From: NÃmeth MÃrton
Date: Sun Jan 10 2010 - 07:39:53 EST


From: MÃrton NÃmeth <nm127@xxxxxxxxxxx>

The id_table field of the struct usb_device_id is constant in <linux/usb.h>
so it is worth to make ub_usb_ids 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 <nm127@xxxxxxxxxxx>
Cc: Julia Lawall <julia@xxxxxxx>
Cc: cocci@xxxxxxx
---
diff -u -p a/drivers/block/ub.c b/drivers/block/ub.c
--- a/drivers/block/ub.c 2009-12-03 04:51:21.000000000 +0100
+++ b/drivers/block/ub.c 2010-01-08 09:14:49.000000000 +0100
@@ -393,7 +393,7 @@ static int ub_probe_lun(struct ub_dev *s
#define ub_usb_ids usb_storage_usb_ids
#else

-static struct usb_device_id ub_usb_ids[] = {
+static const struct usb_device_id ub_usb_ids[] = {
{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, US_SC_SCSI, US_PR_BULK) },
{ }
};
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/