| Message ID | ff83342cc9413d79ba18e05b2cb0b53bff338b2f.1502428689.git.arvind.yadav.cs@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | a67b133b9da539ba30b50a0bb4c333d4e38407e7 |
| Delegated to: | Kalle Valo |
| Headers | show |
Arvind Yadav <arvind.yadav.cs@gmail.com> 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> Patch applied to wireless-drivers-next.git, thanks. a67b133b9da5 brcm80211: constify usb_device_id
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c index 8f20a4b..11ffaa0 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c @@ -1468,7 +1468,7 @@ static int brcmf_usb_reset_resume(struct usb_interface *intf) #define CYPRESS_USB_DEVICE(dev_id) \ { USB_DEVICE(CY_USB_VENDOR_ID_CYPRESS, dev_id) } -static struct usb_device_id brcmf_usb_devid_table[] = { +static const struct usb_device_id brcmf_usb_devid_table[] = { BRCMF_USB_DEVICE(BRCM_USB_43143_DEVICE_ID), BRCMF_USB_DEVICE(BRCM_USB_43236_DEVICE_ID), BRCMF_USB_DEVICE(BRCM_USB_43242_DEVICE_ID),
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> --- changes in v2: Re-submitting wireless separately. changes in v3: Resolve Merge conflic. drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)