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

Commit 5c6b98dd authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: serial: constify device-id tables 



Declare device-id tables as const where possible.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 623c8263

drivers/usb/serial/ftdi_sio.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static struct ftdi_sio_quirk ftdi_8u2232c_quirk = { 
 * Device ID not listed? Test it using

 * /sys/bus/usb-serial/drivers/ftdi_sio/new_id and send a patch or report.

 */

static struct usb_device_id id_table_combined [] = {

static const struct usb_device_id id_table_combined[] = {

	{ USB_DEVICE(FTDI_VID, FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_CTI_MINI_PID) },

	{ USB_DEVICE(FTDI_VID, FTDI_CTI_NANO_PID) },

drivers/usb/serial/ipaq.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int ipaq_open(struct tty_struct *tty, 
static int  ipaq_calc_num_ports(struct usb_serial *serial);

static int  ipaq_startup(struct usb_serial *serial);



static struct usb_device_id ipaq_id_table [] = {

static const struct usb_device_id ipaq_id_table[] = {

	{ USB_DEVICE(0x0104, 0x00BE) }, /* Socket USB Sync */

	{ USB_DEVICE(0x03F0, 0x1016) }, /* HP USB Sync */

	{ USB_DEVICE(0x03F0, 0x1116) }, /* HP USB Sync 1611 */

drivers/usb/serial/metro-usb.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct metrousb_private { 
};



/* Device table list. */

static struct usb_device_id id_table[] = {

static const struct usb_device_id id_table[] = {

	{ USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID_BI) },

	{ USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID_UNI) },

	{ }, /* Terminating entry. */

drivers/usb/serial/qcaux.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#define SAMSUNG_VENDOR_ID			0x04e8

#define SAMSUNG_PRODUCT_U520			0x6640 /* SCH-U520 */



static struct usb_device_id id_table[] = {

static const struct usb_device_id id_table[] = {

	{ USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, UTSTARCOM_PRODUCT_PC5740, 0xff, 0x00, 0x00) },

	{ USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, UTSTARCOM_PRODUCT_PC5750, 0xff, 0x00, 0x00) },

	{ USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, UTSTARCOM_PRODUCT_UM150, 0xff, 0x00, 0x00) },

drivers/usb/serial/safe_serial.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ MODULE_PARM_DESC(padded, "Pad to full wMaxPacketSize On/Off"); 
	.bInterfaceClass = (ic), \

	.bInterfaceSubClass = (isc),



static struct usb_device_id id_table[] = {

static const struct usb_device_id id_table[] = {

	{MY_USB_DEVICE(0x49f, 0xffff, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)},	/* Itsy */

	{MY_USB_DEVICE(0x3f0, 0x2101, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)},	/* Calypso */

	{MY_USB_DEVICE(0x4dd, 0x8001, CDC_DEVICE_CLASS, LINEO_INTERFACE_CLASS, LINEO_INTERFACE_SUBCLASS_SAFESERIAL)},	/* Iris */