* [PATCH] USB: serial: option: creating of the missings constants for Telit products
@ 2020-10-30 15:39 Yann GARRAS
2020-10-30 15:44 ` Johan Hovold
0 siblings, 1 reply; 3+ messages in thread
From: Yann GARRAS @ 2020-10-30 15:39 UTC (permalink / raw)
To: johan; +Cc: linux-usb, Yann GARRAS
Replace hard-coded product id values by constants for Telit Products
Signed-off-by: Yann GARRAS <yann.garras@y3s.fr>
---
drivers/usb/serial/option.c | 40 +++++++++++++++++++++++++------------
1 file changed, 27 insertions(+), 13 deletions(-)
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 2a3bfd6f8..1bc83b687 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -285,12 +285,22 @@ static void option_instat_callback(struct urb *urb);
#define TELIT_PRODUCT_CC864_SINGLE 0x1006
#define TELIT_PRODUCT_DE910_DUAL 0x1010
#define TELIT_PRODUCT_UE910_V2 0x1012
+#define TELIT_PRODUCT_LE910C1_EUX 0x1031
+#define TELIT_PRODUCT_LE910C1_EUX_ECM 0x1033
#define TELIT_PRODUCT_LE922_USBCFG1 0x1040
#define TELIT_PRODUCT_LE922_USBCFG2 0x1041
#define TELIT_PRODUCT_LE922_USBCFG0 0x1042
#define TELIT_PRODUCT_LE922_USBCFG3 0x1043
#define TELIT_PRODUCT_LE922_USBCFG5 0x1045
+#define TELIT_PRODUCT_FN980_RMNET 0x1050
+#define TELIT_PRODUCT_FN980_MBIM 0x1051
+#define TELIT_PRODUCT_FN980_RNDIS 0x1052
+#define TELIT_PRODUCT_FN980_ECM 0x1053
+#define TELIT_PRODUCT_FT980_KS 0x1054
#define TELIT_PRODUCT_ME910 0x1100
+#define TELIT_PRODUCT_ME910G1 0x110a
+#define TELIT_PRODUCT_ME910G1_ECM 0x110b
+#define TELIT_PRODUCT_ME910_ECM 0x1102
#define TELIT_PRODUCT_ME910_DUAL_MODEM 0x1101
#define TELIT_PRODUCT_LE920 0x1200
#define TELIT_PRODUCT_LE910 0x1201
@@ -301,6 +311,10 @@ static void option_instat_callback(struct urb *urb);
#define TELIT_PRODUCT_LE920A4_1212 0x1212
#define TELIT_PRODUCT_LE920A4_1213 0x1213
#define TELIT_PRODUCT_LE920A4_1214 0x1214
+#define TELIT_PRODUCT_LN940_QMI 0x1900
+#define TELIT_PRODUCT_LN940_MBIM 0x1901
+#define TELIT_PRODUCT_SBL_FN980_FLASH 0x9010
+
/* ZTE PRODUCTS */
#define ZTE_VENDOR_ID 0x19d2
@@ -1165,9 +1179,9 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UE910_V2) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1031, 0xff), /* Telit LE910C1-EUX */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910C1_EUX, 0xff),
.driver_info = NCTRL(0) | RSVD(3) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1033, 0xff), /* Telit LE910C1-EUX (ECM) */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910C1_EUX_ECM, 0xff),
.driver_info = NCTRL(0) },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG0),
.driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) },
@@ -1179,25 +1193,25 @@ static const struct usb_device_id option_ids[] = {
.driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
{ USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG5, 0xff),
.driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1050, 0xff), /* Telit FN980 (rmnet) */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_FN980_RMNET, 0xff),
.driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1051, 0xff), /* Telit FN980 (MBIM) */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_FN980_MBIM, 0xff),
.driver_info = NCTRL(0) | RSVD(1) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1052, 0xff), /* Telit FN980 (RNDIS) */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_FN980_RNDIS, 0xff),
.driver_info = NCTRL(2) | RSVD(3) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1053, 0xff), /* Telit FN980 (ECM) */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_FN980_ECM, 0xff),
.driver_info = NCTRL(0) | RSVD(1) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1054, 0xff), /* Telit FT980-KS */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_FT980_KS, 0xff),
.driver_info = NCTRL(2) | RSVD(3) },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),
.driver_info = NCTRL(0) | RSVD(1) | RSVD(3) },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),
.driver_info = NCTRL(0) | RSVD(3) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1102, 0xff), /* Telit ME910 (ECM) */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_ECM, 0xff),
.driver_info = NCTRL(0) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x110a, 0xff), /* Telit ME910G1 */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910G1, 0xff),
.driver_info = NCTRL(0) | RSVD(3) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x110b, 0xff), /* Telit ME910G1 (ECM) */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910G1_ECM, 0xff),
.driver_info = NCTRL(0) },
{ USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910),
.driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
@@ -1219,11 +1233,11 @@ static const struct usb_device_id option_ids[] = {
.driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
{ USB_DEVICE(TELIT_VENDOR_ID, 0x1261),
.driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
- { USB_DEVICE(TELIT_VENDOR_ID, 0x1900), /* Telit LN940 (QMI) */
+ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LN940_QMI),
.driver_info = NCTRL(0) | RSVD(1) },
- { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1901, 0xff), /* Telit LN940 (MBIM) */
+ { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LN940_MBIM, 0xff),
.driver_info = NCTRL(0) },
- { USB_DEVICE(TELIT_VENDOR_ID, 0x9010), /* Telit SBL FN980 flashing device */
+ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_SBL_FN980_FLASH),
.driver_info = NCTRL(0) | ZLP },
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff),
--
2.17.2 (Apple Git-113)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] USB: serial: option: creating of the missings constants for Telit products
2020-10-30 15:39 [PATCH] USB: serial: option: creating of the missings constants for Telit products Yann GARRAS
@ 2020-10-30 15:44 ` Johan Hovold
[not found] ` <CACosQq_fHtfdp9sevpVz4jn0uao1m2S5Lmd_27p3LGbFRwScLw@mail.gmail.com>
0 siblings, 1 reply; 3+ messages in thread
From: Johan Hovold @ 2020-10-30 15:44 UTC (permalink / raw)
To: Yann GARRAS; +Cc: johan, linux-usb
On Fri, Oct 30, 2020 at 04:39:27PM +0100, Yann GARRAS wrote:
> Replace hard-coded product id values by constants for Telit Products
The defines don't add anything of value, so I've been trying to move
away from using them. We should probably do the opposite conversion and
ditch the remaining defines at some point instead.
Johan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] USB: serial: option: creating of the missings constants for Telit products
[not found] ` <CACosQq_fHtfdp9sevpVz4jn0uao1m2S5Lmd_27p3LGbFRwScLw@mail.gmail.com>
@ 2020-11-04 10:40 ` Johan Hovold
0 siblings, 0 replies; 3+ messages in thread
From: Johan Hovold @ 2020-11-04 10:40 UTC (permalink / raw)
To: Yann Garras; +Cc: Johan Hovold, linux-usb
On Fri, Oct 30, 2020 at 06:22:20PM +0100, Yann Garras wrote:
> Hi,
> Thank you for your response.
>
> Personally, I find more valuable to read :
> { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910C1_EUX,
> 0xff),
> .driver_info = NCTRL(0) | RSVD(3) },
>
> Rather than
> { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1031, 0xff),
> .driver_info = NCTRL(0) | RSVD(3) },
Sure, but we try to keep the model name in a comment after the entry.
That way you get a more compact notation (one line less) and you can
still find the model name easily.
> But where I agree with you, is to make a choice and apply it.
Yeah, the current half-measure isn't optimal.
Johan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-04 10:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-30 15:39 [PATCH] USB: serial: option: creating of the missings constants for Telit products Yann GARRAS
2020-10-30 15:44 ` Johan Hovold
[not found] ` <CACosQq_fHtfdp9sevpVz4jn0uao1m2S5Lmd_27p3LGbFRwScLw@mail.gmail.com>
2020-11-04 10:40 ` Johan Hovold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).