diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:13:17 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:13:17 +0200 |
| commit | 5c891d5e094c15bd7791dc84749b5239257f5f2d (patch) | |
| tree | bcfc6ca02f988aef9860de3a4fe52589151f8db3 /drivers | |
| parent | 38e50c9ba84ad755247220ce6a881fbdb44aaeec (diff) | |
| parent | 0acb310c3273d55ad19c9a5f48b73224ce6e2dc0 (diff) | |
| download | linux-5c891d5e094c15bd7791dc84749b5239257f5f2d.tar.bz2 | |
Merge branch 'for-4.14/upstream' into for-linus
- usb_device_id and snd_rawmidi_ops constifications from Julia Lawall
and Arvind Yadav
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/hid-prodikeys.c | 2 | ||||
| -rw-r--r-- | drivers/hid/usbhid/usbkbd.c | 2 | ||||
| -rw-r--r-- | drivers/hid/usbhid/usbmouse.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hid-prodikeys.c b/drivers/hid/hid-prodikeys.c index f095bf8a3aa9..49c4bd34b3c5 100644 --- a/drivers/hid/hid-prodikeys.c +++ b/drivers/hid/hid-prodikeys.c @@ -593,7 +593,7 @@ static void pcmidi_in_trigger(struct snd_rawmidi_substream *substream, int up) pm->in_triggered = up; } -static struct snd_rawmidi_ops pcmidi_in_ops = { +static const struct snd_rawmidi_ops pcmidi_in_ops = { .open = pcmidi_in_open, .close = pcmidi_in_close, .trigger = pcmidi_in_trigger diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c index 7fb2d1e4f5dd..ed01dc425d29 100644 --- a/drivers/hid/usbhid/usbkbd.c +++ b/drivers/hid/usbhid/usbkbd.c @@ -392,7 +392,7 @@ static void usb_kbd_disconnect(struct usb_interface *intf) } } -static struct usb_device_id usb_kbd_id_table [] = { +static const struct usb_device_id usb_kbd_id_table[] = { { USB_INTERFACE_INFO(USB_INTERFACE_CLASS_HID, USB_INTERFACE_SUBCLASS_BOOT, USB_INTERFACE_PROTOCOL_KEYBOARD) }, { } /* Terminating entry */ diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c index dd911c5241d8..589ad7c15a58 100644 --- a/drivers/hid/usbhid/usbmouse.c +++ b/drivers/hid/usbhid/usbmouse.c @@ -226,7 +226,7 @@ static void usb_mouse_disconnect(struct usb_interface *intf) } } -static struct usb_device_id usb_mouse_id_table [] = { +static const struct usb_device_id usb_mouse_id_table[] = { { USB_INTERFACE_INFO(USB_INTERFACE_CLASS_HID, USB_INTERFACE_SUBCLASS_BOOT, USB_INTERFACE_PROTOCOL_MOUSE) }, { } /* Terminating entry */ |