| Message ID | 1502614485-2150-3-git-send-email-arvind.yadav.cs@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Aug 13, 2017 at 02:24:44PM +0530, Arvind Yadav wrote: > usb_device_id are not supposed to change at runtime. All functions > working with usb_device_id provided by <linux/usb.h> work with > const usb_device_id. So mark the non-const structs as const. > > Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com> Acked-by: Sean Young <sean@mess.org> Thanks for spotting that. Sean > --- > drivers/media/rc/ati_remote.c | 2 +- > drivers/media/rc/igorplugusb.c | 2 +- > drivers/media/rc/imon.c | 2 +- > drivers/media/rc/mceusb.c | 2 +- > drivers/media/rc/redrat3.c | 2 +- > drivers/media/rc/streamzap.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c > index a4c6ad4..d1d0c48 100644 > --- a/drivers/media/rc/ati_remote.c > +++ b/drivers/media/rc/ati_remote.c > @@ -198,7 +198,7 @@ static const struct ati_receiver_type type_firefly = { > .default_keymap = RC_MAP_SNAPSTREAM_FIREFLY > }; > > -static struct usb_device_id ati_remote_table[] = { > +static const struct usb_device_id ati_remote_table[] = { > { > USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID), > .driver_info = (unsigned long)&type_ati > diff --git a/drivers/media/rc/igorplugusb.c b/drivers/media/rc/igorplugusb.c > index cb6d4f1..c294ec5 100644 > --- a/drivers/media/rc/igorplugusb.c > +++ b/drivers/media/rc/igorplugusb.c > @@ -244,7 +244,7 @@ static void igorplugusb_disconnect(struct usb_interface *intf) > usb_free_urb(ir->urb); > } > > -static struct usb_device_id igorplugusb_table[] = { > +static const struct usb_device_id igorplugusb_table[] = { > /* Igor Plug USB (Atmel's Manufact. ID) */ > { USB_DEVICE(0x03eb, 0x0002) }, > /* Fit PC2 Infrared Adapter */ > diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c > index bd76534..3f414ab 100644 > --- a/drivers/media/rc/imon.c > +++ b/drivers/media/rc/imon.c > @@ -346,7 +346,7 @@ static const struct imon_usb_dev_descr imon_ir_raw = { > * devices use the SoundGraph vendor ID (0x15c2). This driver only supports > * the ffdc and later devices, which do onboard decoding. > */ > -static struct usb_device_id imon_usb_id_table[] = { > +static const struct usb_device_id imon_usb_id_table[] = { > /* > * Several devices with this same device ID, all use iMON_PAD.inf > * SoundGraph iMON PAD (IR & VFD) > diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c > index eb13069..6664d91 100644 > --- a/drivers/media/rc/mceusb.c > +++ b/drivers/media/rc/mceusb.c > @@ -249,7 +249,7 @@ static const struct mceusb_model mceusb_model[] = { > }, > }; > > -static struct usb_device_id mceusb_dev_table[] = { > +static const struct usb_device_id mceusb_dev_table[] = { > /* Original Microsoft MCE IR Transceiver (often HP-branded) */ > { USB_DEVICE(VENDOR_MICROSOFT, 0x006d), > .driver_info = MCE_GEN1 }, > diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c > index 56d43be..48f27ac 100644 > --- a/drivers/media/rc/redrat3.c > +++ b/drivers/media/rc/redrat3.c > @@ -186,7 +186,7 @@ struct redrat3_error { > } __packed; > > /* table of devices that work with this driver */ > -static struct usb_device_id redrat3_dev_table[] = { > +static const struct usb_device_id redrat3_dev_table[] = { > /* Original version of the RedRat3 */ > {USB_DEVICE(USB_RR3USB_VENDOR_ID, USB_RR3USB_PRODUCT_ID)}, > /* Second Version/release of the RedRat3 - RetRat3-II */ > diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c > index b09c45a..1f00727 100644 > --- a/drivers/media/rc/streamzap.c > +++ b/drivers/media/rc/streamzap.c > @@ -43,7 +43,7 @@ > #define USB_STREAMZAP_PRODUCT_ID 0x0000 > > /* table of devices that work with this driver */ > -static struct usb_device_id streamzap_table[] = { > +static const struct usb_device_id streamzap_table[] = { > /* Streamzap Remote Control */ > { USB_DEVICE(USB_STREAMZAP_VENDOR_ID, USB_STREAMZAP_PRODUCT_ID) }, > /* Terminating entry */ > -- > 2.7.4
diff --git a/drivers/media/rc/ati_remote.c b/drivers/media/rc/ati_remote.c index a4c6ad4..d1d0c48 100644 --- a/drivers/media/rc/ati_remote.c +++ b/drivers/media/rc/ati_remote.c @@ -198,7 +198,7 @@ static const struct ati_receiver_type type_firefly = { .default_keymap = RC_MAP_SNAPSTREAM_FIREFLY }; -static struct usb_device_id ati_remote_table[] = { +static const struct usb_device_id ati_remote_table[] = { { USB_DEVICE(ATI_REMOTE_VENDOR_ID, LOLA_REMOTE_PRODUCT_ID), .driver_info = (unsigned long)&type_ati diff --git a/drivers/media/rc/igorplugusb.c b/drivers/media/rc/igorplugusb.c index cb6d4f1..c294ec5 100644 --- a/drivers/media/rc/igorplugusb.c +++ b/drivers/media/rc/igorplugusb.c @@ -244,7 +244,7 @@ static void igorplugusb_disconnect(struct usb_interface *intf) usb_free_urb(ir->urb); } -static struct usb_device_id igorplugusb_table[] = { +static const struct usb_device_id igorplugusb_table[] = { /* Igor Plug USB (Atmel's Manufact. ID) */ { USB_DEVICE(0x03eb, 0x0002) }, /* Fit PC2 Infrared Adapter */ diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index bd76534..3f414ab 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c @@ -346,7 +346,7 @@ static const struct imon_usb_dev_descr imon_ir_raw = { * devices use the SoundGraph vendor ID (0x15c2). This driver only supports * the ffdc and later devices, which do onboard decoding. */ -static struct usb_device_id imon_usb_id_table[] = { +static const struct usb_device_id imon_usb_id_table[] = { /* * Several devices with this same device ID, all use iMON_PAD.inf * SoundGraph iMON PAD (IR & VFD) diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c index eb13069..6664d91 100644 --- a/drivers/media/rc/mceusb.c +++ b/drivers/media/rc/mceusb.c @@ -249,7 +249,7 @@ static const struct mceusb_model mceusb_model[] = { }, }; -static struct usb_device_id mceusb_dev_table[] = { +static const struct usb_device_id mceusb_dev_table[] = { /* Original Microsoft MCE IR Transceiver (often HP-branded) */ { USB_DEVICE(VENDOR_MICROSOFT, 0x006d), .driver_info = MCE_GEN1 }, diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c index 56d43be..48f27ac 100644 --- a/drivers/media/rc/redrat3.c +++ b/drivers/media/rc/redrat3.c @@ -186,7 +186,7 @@ struct redrat3_error { } __packed; /* table of devices that work with this driver */ -static struct usb_device_id redrat3_dev_table[] = { +static const struct usb_device_id redrat3_dev_table[] = { /* Original version of the RedRat3 */ {USB_DEVICE(USB_RR3USB_VENDOR_ID, USB_RR3USB_PRODUCT_ID)}, /* Second Version/release of the RedRat3 - RetRat3-II */ diff --git a/drivers/media/rc/streamzap.c b/drivers/media/rc/streamzap.c index b09c45a..1f00727 100644 --- a/drivers/media/rc/streamzap.c +++ b/drivers/media/rc/streamzap.c @@ -43,7 +43,7 @@ #define USB_STREAMZAP_PRODUCT_ID 0x0000 /* table of devices that work with this driver */ -static struct usb_device_id streamzap_table[] = { +static const struct usb_device_id streamzap_table[] = { /* Streamzap Remote Control */ { USB_DEVICE(USB_STREAMZAP_VENDOR_ID, USB_STREAMZAP_PRODUCT_ID) }, /* Terminating entry */
usb_device_id are not supposed to change at runtime. All functions working with usb_device_id provided by <linux/usb.h> work with const usb_device_id. So mark the non-const structs as const. Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com> --- drivers/media/rc/ati_remote.c | 2 +- drivers/media/rc/igorplugusb.c | 2 +- drivers/media/rc/imon.c | 2 +- drivers/media/rc/mceusb.c | 2 +- drivers/media/rc/redrat3.c | 2 +- drivers/media/rc/streamzap.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)