Merge branch 'for-4.14/upstream' into for-linus

Jiri Kosina · Jiri Kosina · commit 5c891d5e094c · 2017-09-05T11:13:17.000+02:00
- usb_device_id and snd_rawmidi_ops constifications from Julia Lawall
  and Arvind Yadav
diff --git 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
@@ -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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -593,7 +593,7 @@ static void pcmidi_in_trigger(struct snd_rawmidi_substream *substream, int up)`
`593`	`593`	`pm->in_triggered = up;`
`594`	`594`	`}`
`595`	`595`
`596`		`-static struct snd_rawmidi_ops pcmidi_in_ops = {`
	`596`	`+static const struct snd_rawmidi_ops pcmidi_in_ops = {`
`597`	`597`	`.open = pcmidi_in_open,`
`598`	`598`	`.close = pcmidi_in_close,`
`599`	`599`	`.trigger = pcmidi_in_trigger`
Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ static void usb_kbd_disconnect(struct usb_interface *intf)`
`392`	`392`	`}`
`393`	`393`	`}`
`394`	`394`
`395`		`-static struct usb_device_id usb_kbd_id_table [] = {`
	`395`	`+static const struct usb_device_id usb_kbd_id_table[] = {`
`396`	`396`	`{ USB_INTERFACE_INFO(USB_INTERFACE_CLASS_HID, USB_INTERFACE_SUBCLASS_BOOT,`
`397`	`397`	`USB_INTERFACE_PROTOCOL_KEYBOARD) },`
`398`	`398`	`{ } /* Terminating entry */`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ static void usb_mouse_disconnect(struct usb_interface *intf)`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
`229`		`-static struct usb_device_id usb_mouse_id_table [] = {`
	`229`	`+static const struct usb_device_id usb_mouse_id_table[] = {`
`230`	`230`	`{ USB_INTERFACE_INFO(USB_INTERFACE_CLASS_HID, USB_INTERFACE_SUBCLASS_BOOT,`
`231`	`231`	`USB_INTERFACE_PROTOCOL_MOUSE) },`
`232`	`232`	`{ } /* Terminating entry */`