Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c891d5e authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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

- usb_device_id and snd_rawmidi_ops constifications from Julia Lawall
  and Arvind Yadav
parents 38e50c9b 0acb310c

drivers/hid/hid-prodikeys.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/hid/usbhid/usbkbd.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/hid/usbhid/usbmouse.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */