tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
USB: serial: simple: sort driver entries
Sort the driver symbols alphabetically in order to make it more obvious
where new driver entries should be added.
Cc: stable@vger.kernel.org
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
+33
-33
+33
-33
drivers/usb/serial/usb-serial-simple.c
+33
-33
drivers/usb/serial/usb-serial-simple.c
···
38
38
{ USB_DEVICE(0x0a21, 0x8001) } /* MMT-7305WW */
39
39
DEVICE(carelink, CARELINK_IDS);
40
40
41
-
/* ZIO Motherboard USB driver */
42
-
#define ZIO_IDS() \
43
-
{ USB_DEVICE(0x1CBE, 0x0103) }
44
-
DEVICE(zio, ZIO_IDS);
45
-
46
-
/* Funsoft Serial USB driver */
47
-
#define FUNSOFT_IDS() \
48
-
{ USB_DEVICE(0x1404, 0xcddc) }
49
-
DEVICE(funsoft, FUNSOFT_IDS);
50
-
51
41
/* Infineon Flashloader driver */
52
42
#define FLASHLOADER_IDS() \
53
43
{ USB_DEVICE_INTERFACE_CLASS(0x058b, 0x0041, USB_CLASS_CDC_DATA) }, \
54
44
{ USB_DEVICE(0x8087, 0x0716) }, \
55
45
{ USB_DEVICE(0x8087, 0x0801) }
56
46
DEVICE(flashloader, FLASHLOADER_IDS);
47
+
48
+
/* Funsoft Serial USB driver */
49
+
#define FUNSOFT_IDS() \
50
+
{ USB_DEVICE(0x1404, 0xcddc) }
51
+
DEVICE(funsoft, FUNSOFT_IDS);
57
52
58
53
/* Google Serial USB SubClass */
59
54
#define GOOGLE_IDS() \
···
57
62
0x50, \
58
63
0x01) }
59
64
DEVICE(google, GOOGLE_IDS);
65
+
66
+
/* HP4x (48/49) Generic Serial driver */
67
+
#define HP4X_IDS() \
68
+
{ USB_DEVICE(0x03f0, 0x0121) }
69
+
DEVICE(hp4x, HP4X_IDS);
60
70
61
71
/* KAUFMANN RKS+CAN VCP */
62
72
#define KAUFMANN_IDS() \
···
72
72
#define LIBTRANSISTOR_IDS() \
73
73
{ USB_DEVICE(0x1209, 0x8b00) }
74
74
DEVICE(libtransistor, LIBTRANSISTOR_IDS);
75
-
76
-
/* ViVOpay USB Serial Driver */
77
-
#define VIVOPAY_IDS() \
78
-
{ USB_DEVICE(0x1d5f, 0x1004) } /* ViVOpay 8800 */
79
-
DEVICE(vivopay, VIVOPAY_IDS);
80
75
81
76
/* Motorola USB Phone driver */
82
77
#define MOTO_IDS() \
···
101
106
{ USB_DEVICE(0x09d7, 0x0100) } /* NovAtel FlexPack GPS */
102
107
DEVICE_N(novatel_gps, NOVATEL_IDS, 3);
103
108
104
-
/* HP4x (48/49) Generic Serial driver */
105
-
#define HP4X_IDS() \
106
-
{ USB_DEVICE(0x03f0, 0x0121) }
107
-
DEVICE(hp4x, HP4X_IDS);
109
+
/* Siemens USB/MPI adapter */
110
+
#define SIEMENS_IDS() \
111
+
{ USB_DEVICE(0x908, 0x0004) }
112
+
DEVICE(siemens_mpi, SIEMENS_IDS);
108
113
109
114
/* Suunto ANT+ USB Driver */
110
115
#define SUUNTO_IDS() \
···
112
117
{ USB_DEVICE(0x0fcf, 0x1009) } /* Dynastream ANT USB-m Stick */
113
118
DEVICE(suunto, SUUNTO_IDS);
114
119
115
-
/* Siemens USB/MPI adapter */
116
-
#define SIEMENS_IDS() \
117
-
{ USB_DEVICE(0x908, 0x0004) }
118
-
DEVICE(siemens_mpi, SIEMENS_IDS);
120
+
/* ViVOpay USB Serial Driver */
121
+
#define VIVOPAY_IDS() \
122
+
{ USB_DEVICE(0x1d5f, 0x1004) } /* ViVOpay 8800 */
123
+
DEVICE(vivopay, VIVOPAY_IDS);
124
+
125
+
/* ZIO Motherboard USB driver */
126
+
#define ZIO_IDS() \
127
+
{ USB_DEVICE(0x1CBE, 0x0103) }
128
+
DEVICE(zio, ZIO_IDS);
119
129
120
130
/* All of the above structures mushed into two lists */
121
131
static struct usb_serial_driver * const serial_drivers[] = {
122
132
&carelink_device,
123
-
&zio_device,
124
-
&funsoft_device,
125
133
&flashloader_device,
134
+
&funsoft_device,
126
135
&google_device,
136
+
&hp4x_device,
127
137
&kaufmann_device,
128
138
&libtransistor_device,
129
-
&vivopay_device,
130
139
&moto_modem_device,
131
140
&motorola_tetra_device,
132
141
&nokia_device,
133
142
&novatel_gps_device,
134
-
&hp4x_device,
135
-
&suunto_device,
136
143
&siemens_mpi_device,
144
+
&suunto_device,
145
+
&vivopay_device,
146
+
&zio_device,
137
147
NULL
138
148
};
139
149
140
150
static const struct usb_device_id id_table[] = {
141
151
CARELINK_IDS(),
142
-
ZIO_IDS(),
143
-
FUNSOFT_IDS(),
144
152
FLASHLOADER_IDS(),
153
+
FUNSOFT_IDS(),
145
154
GOOGLE_IDS(),
155
+
HP4X_IDS(),
146
156
KAUFMANN_IDS(),
147
157
LIBTRANSISTOR_IDS(),
148
-
VIVOPAY_IDS(),
149
158
MOTO_IDS(),
150
159
MOTOROLA_TETRA_IDS(),
151
160
NOKIA_IDS(),
152
161
NOVATEL_IDS(),
153
-
HP4X_IDS(),
154
-
SUUNTO_IDS(),
155
162
SIEMENS_IDS(),
163
+
SUUNTO_IDS(),
164
+
VIVOPAY_IDS(),
165
+
ZIO_IDS(),
156
166
{ },
157
167
};
158
168
MODULE_DEVICE_TABLE(usb, id_table);