USB class: 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:
Родитель
1bd4f29d0a
Коммит
6ef4852b13
|
@ -1489,7 +1489,7 @@ static int acm_reset_resume(struct usb_interface *intf)
|
|||
* USB driver structure.
|
||||
*/
|
||||
|
||||
static struct usb_device_id acm_ids[] = {
|
||||
static const struct usb_device_id acm_ids[] = {
|
||||
/* quirky and broken devices */
|
||||
{ USB_DEVICE(0x0870, 0x0001), /* Metricom GS Modem */
|
||||
.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
#define DRIVER_AUTHOR "Oliver Neukum"
|
||||
#define DRIVER_DESC "USB Abstract Control Model driver for USB WCM Device Management"
|
||||
|
||||
static struct usb_device_id wdm_ids[] = {
|
||||
static const struct usb_device_id wdm_ids[] = {
|
||||
{
|
||||
.match_flags = USB_DEVICE_ID_MATCH_INT_CLASS |
|
||||
USB_DEVICE_ID_MATCH_INT_SUBCLASS,
|
||||
|
|
|
@ -1390,7 +1390,7 @@ static int usblp_resume(struct usb_interface *intf)
|
|||
return r;
|
||||
}
|
||||
|
||||
static struct usb_device_id usblp_ids [] = {
|
||||
static const struct usb_device_id usblp_ids[] = {
|
||||
{ USB_DEVICE_INFO(7, 1, 1) },
|
||||
{ USB_DEVICE_INFO(7, 1, 2) },
|
||||
{ USB_DEVICE_INFO(7, 1, 3) },
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
*/
|
||||
#define USBTMC_MAX_READS_TO_CLEAR_BULK_IN 100
|
||||
|
||||
static struct usb_device_id usbtmc_devices[] = {
|
||||
static const struct usb_device_id usbtmc_devices[] = {
|
||||
{ USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), },
|
||||
{ USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 1), },
|
||||
{ 0, } /* terminating entry */
|
||||
|
|
|
@ -641,7 +641,7 @@ static void cbaf_disconnect(struct usb_interface *iface)
|
|||
kzfree(cbaf);
|
||||
}
|
||||
|
||||
static struct usb_device_id cbaf_id_table[] = {
|
||||
static const struct usb_device_id cbaf_id_table[] = {
|
||||
{ USB_INTERFACE_INFO(0xef, 0x03, 0x01), },
|
||||
{ },
|
||||
};
|
||||
|
|
Загрузка…
Ссылка в новой задаче