Merge tag 'usb-serial-4.17-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next

Johan writes:

USB-serial updates for v4.17-rc1

Here are the USB-serial updates for 4.17-rc1, including a
reimplementation of the option-driver interface masking which allows
for a more compact notation when adding new device entries.

Included are also a couple of clean ups and a new ftdi_sio device id.

All but the device-id commit have been in linux-next (without any
reported issues).

Signed-off-by: Johan Hovold <johan@kernel.org>

3 files changed, 155 insertions, 304 deletions

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 87202ad5a50d..566f25781ea0 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -894,6 +894,7 @@ static const struct usb_device_id id_table_combined[] = {
         { USB_DEVICE(PI_VID, PI_1014_PID) },
         { USB_DEVICE(PI_VID, PI_1015_PID) },
         { USB_DEVICE(PI_VID, PI_1016_PID) },
+        { USB_DEVICE(PI_VID, PI_E870_PID) },
         { USB_DEVICE(KONDO_VID, KONDO_USB_SERIAL_PID) },
         { USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
         { USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 975d02666c5a..f7790758de7c 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -981,6 +981,7 @@
 #define PI_1014_PID     0x1014  /* PI Device */
 #define PI_1015_PID     0x1015  /* PI Device */
 #define PI_1016_PID     0x1016  /* PI Digital Servo Module */
+#define PI_E870_PID     0x1019  /* PI E-870 Piezomotor Controller */
 
 /*
  * Kondo Kagaku Co.Ltd.
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 2d8d9150da0c..c3f252283ab9 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -548,151 +548,15 @@ static void option_instat_callback(struct urb *urb);
 #define WETELECOM_PRODUCT_6802                  0x6802
 #define WETELECOM_PRODUCT_WMD300                0x6803
 
-struct option_blacklist_info {
-        /* bitmask of interface numbers blacklisted for send_setup */
-        const unsigned long sendsetup;
-        /* bitmask of interface numbers that are reserved */
-        const unsigned long reserved;
-};
-
-static const struct option_blacklist_info four_g_w14_blacklist = {
-        .sendsetup = BIT(0) | BIT(1),
-};
-
-static const struct option_blacklist_info four_g_w100_blacklist = {
-        .sendsetup = BIT(1) | BIT(2),
-        .reserved = BIT(3),
-};
-
-static const struct option_blacklist_info alcatel_x200_blacklist = {
-        .sendsetup = BIT(0) | BIT(1),
-        .reserved = BIT(4),
-};
-
-static const struct option_blacklist_info zte_0037_blacklist = {
-        .sendsetup = BIT(0) | BIT(1),
-};
-
-static const struct option_blacklist_info zte_k3765_z_blacklist = {
-        .sendsetup = BIT(0) | BIT(1) | BIT(2),
-        .reserved = BIT(4),
-};
-
-static const struct option_blacklist_info zte_ad3812_z_blacklist = {
-        .sendsetup = BIT(0) | BIT(1) | BIT(2),
-};
-
-static const struct option_blacklist_info zte_mc2718_z_blacklist = {
-        .sendsetup = BIT(1) | BIT(2) | BIT(3) | BIT(4),
-};
-
-static const struct option_blacklist_info zte_mc2716_z_blacklist = {
-        .sendsetup = BIT(1) | BIT(2) | BIT(3),
-};
-
-static const struct option_blacklist_info zte_me3620_mbim_blacklist = {
-        .reserved = BIT(2) | BIT(3) | BIT(4),
-};
-
-static const struct option_blacklist_info zte_me3620_xl_blacklist = {
-        .reserved = BIT(3) | BIT(4) | BIT(5),
-};
-
-static const struct option_blacklist_info zte_zm8620_x_blacklist = {
-        .reserved = BIT(3) | BIT(4) | BIT(5),
-};
-
-static const struct option_blacklist_info huawei_cdc12_blacklist = {
-        .reserved = BIT(1) | BIT(2),
-};
-
-static const struct option_blacklist_info net_intf0_blacklist = {
-        .reserved = BIT(0),
-};
-
-static const struct option_blacklist_info net_intf1_blacklist = {
-        .reserved = BIT(1),
-};
-
-static const struct option_blacklist_info net_intf2_blacklist = {
-        .reserved = BIT(2),
-};
-
-static const struct option_blacklist_info net_intf3_blacklist = {
-        .reserved = BIT(3),
-};
-
-static const struct option_blacklist_info net_intf4_blacklist = {
-        .reserved = BIT(4),
-};
-
-static const struct option_blacklist_info net_intf5_blacklist = {
-        .reserved = BIT(5),
-};
-
-static const struct option_blacklist_info net_intf6_blacklist = {
-        .reserved = BIT(6),
-};
-
-static const struct option_blacklist_info zte_mf626_blacklist = {
-        .sendsetup = BIT(0) | BIT(1),
-        .reserved = BIT(4),
-};
-
-static const struct option_blacklist_info zte_1255_blacklist = {
-        .reserved = BIT(3) | BIT(4),
-};
-
-static const struct option_blacklist_info simcom_sim7100e_blacklist = {
-        .reserved = BIT(5) | BIT(6),
-};
-
-static const struct option_blacklist_info telit_me910_blacklist = {
-        .sendsetup = BIT(0),
-        .reserved = BIT(1) | BIT(3),
-};
-
-static const struct option_blacklist_info telit_me910_dual_modem_blacklist = {
-        .sendsetup = BIT(0),
-        .reserved = BIT(3),
-};
-
-static const struct option_blacklist_info telit_le910_blacklist = {
-        .sendsetup = BIT(0),
-        .reserved = BIT(1) | BIT(2),
-};
 
-static const struct option_blacklist_info telit_le920_blacklist = {
-        .sendsetup = BIT(0),
-        .reserved = BIT(1) | BIT(5),
-};
+/* Device flags */
 
-static const struct option_blacklist_info telit_le920a4_blacklist_1 = {
-        .sendsetup = BIT(0),
-        .reserved = BIT(1),
-};
+/* Interface does not support modem-control requests */
+#define NCTRL(ifnum)    ((BIT(ifnum) & 0xff) << 8)
 
-static const struct option_blacklist_info telit_le922_blacklist_usbcfg0 = {
-        .sendsetup = BIT(2),
-        .reserved = BIT(0) | BIT(1) | BIT(3),
-};
+/* Interface is reserved */
+#define RSVD(ifnum)     ((BIT(ifnum) & 0xff) << 0)
 
-static const struct option_blacklist_info telit_le922_blacklist_usbcfg3 = {
-        .sendsetup = BIT(0),
-        .reserved = BIT(1) | BIT(2) | BIT(3),
-};
-
-static const struct option_blacklist_info cinterion_rmnet2_blacklist = {
-        .reserved = BIT(4) | BIT(5),
-};
-
-static const struct option_blacklist_info yuga_clm920_nc5_blacklist = {
-        .reserved = BIT(1) | BIT(4),
-};
-
-static const struct option_blacklist_info quectel_ep06_blacklist = {
-        .reserved = BIT(4) | BIT(5),
-};
 
 static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
@@ -726,26 +590,26 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) },
         { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
         { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c05, USB_CLASS_COMM, 0x02, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c1f, USB_CLASS_COMM, 0x02, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1c23, USB_CLASS_COMM, 0x02, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t) &net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S6, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t) &net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1750, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t) &net_intf2_blacklist },
+          .driver_info = RSVD(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1441, USB_CLASS_COMM, 0x02, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x1442, USB_CLASS_COMM, 0x02, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
+          .driver_info = RSVD(1) | RSVD(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
+          .driver_info = RSVD(1) | RSVD(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0x14ac, 0xff, 0xff, 0xff),    /* Huawei E1820 */
-                .driver_info = (kernel_ulong_t) &net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4605, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
+          .driver_info = RSVD(1) | RSVD(2) },
         { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0xff, 0xff) },
         { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x01) },
         { USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, 0xff, 0x01, 0x02) },
@@ -1190,67 +1054,67 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
         { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6000)}, /* ZTE AC8700 */
         { USB_DEVICE_AND_INTERFACE_INFO(QUALCOMM_VENDOR_ID, 0x6001, 0xff, 0xff, 0xff), /* 4G LTE usb-modem U901 */
-          .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
         { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
         { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */
         /* Quectel products using Qualcomm vendor ID */
         { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
         { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         /* Yuga products use Qualcomm vendor ID */
         { USB_DEVICE(QUALCOMM_VENDOR_ID, YUGA_PRODUCT_CLM920_NC5),
-          .driver_info = (kernel_ulong_t)&yuga_clm920_nc5_blacklist },
+          .driver_info = RSVD(1) | RSVD(4) },
         /* Quectel products using Quectel vendor ID */
         { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC25),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06),
-          .driver_info = (kernel_ulong_t)&quectel_ep06_blacklist },
+          .driver_info = RSVD(4) | RSVD(5) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),
-          .driver_info = (kernel_ulong_t)&net_intf0_blacklist },
+          .driver_info = RSVD(0) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6004) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6005) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CGU_628A) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHE_628S),
-          .driver_info = (kernel_ulong_t)&net_intf0_blacklist },
+          .driver_info = RSVD(0) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_301),
-          .driver_info = (kernel_ulong_t)&net_intf0_blacklist },
+          .driver_info = RSVD(0) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_628),
-          .driver_info = (kernel_ulong_t)&net_intf0_blacklist },
+          .driver_info = RSVD(0) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_628S) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CDU_680) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CDU_685A) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_720S),
-          .driver_info = (kernel_ulong_t)&net_intf0_blacklist },
+          .driver_info = RSVD(0) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7002),
-          .driver_info = (kernel_ulong_t)&net_intf0_blacklist },
+          .driver_info = RSVD(0) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_629K),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7004),
-          .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7005) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CGU_629),
-          .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_629S),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CHU_720I),
-          .driver_info = (kernel_ulong_t)&net_intf0_blacklist },
+          .driver_info = RSVD(0) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7212),
-          .driver_info = (kernel_ulong_t)&net_intf0_blacklist },
+          .driver_info = RSVD(0) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7213),
-          .driver_info = (kernel_ulong_t)&net_intf0_blacklist },
+          .driver_info = RSVD(0) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7251),
-          .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7252),
-          .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_7253),
-          .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864G) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_DUAL) },
@@ -1258,38 +1122,38 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UE910_V2) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG0),
-                .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 },
+          .driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG1),
-                .driver_info = (kernel_ulong_t)&telit_le910_blacklist },
+          .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG2),
-                .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
+          .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG3),
-                .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
+          .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
         { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE922_USBCFG5, 0xff),
-                .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg0 },
+          .driver_info = RSVD(0) | RSVD(1) | NCTRL(2) | RSVD(3) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910),
-                .driver_info = (kernel_ulong_t)&telit_me910_blacklist },
+          .driver_info = NCTRL(0) | RSVD(1) | RSVD(3) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM),
-                .driver_info = (kernel_ulong_t)&telit_me910_dual_modem_blacklist },
+          .driver_info = NCTRL(0) | RSVD(3) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910),
-                .driver_info = (kernel_ulong_t)&telit_le910_blacklist },
+          .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE910_USBCFG4),
-                .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
+          .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920),
-                .driver_info = (kernel_ulong_t)&telit_le920_blacklist },
+          .driver_info = NCTRL(0) | RSVD(1) | RSVD(5) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1207) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1208),
-                .driver_info = (kernel_ulong_t)&telit_le920a4_blacklist_1 },
+          .driver_info = NCTRL(0) | RSVD(1) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1211),
-                .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
+          .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1212),
-                .driver_info = (kernel_ulong_t)&telit_le920a4_blacklist_1 },
+          .driver_info = NCTRL(0) | RSVD(1) },
         { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1213, 0xff) },
         { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_LE920A4_1214),
-                .driver_info = (kernel_ulong_t)&telit_le922_blacklist_usbcfg3 },
+          .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) | RSVD(3) },
         { 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),
-                .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0003, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0004, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0005, 0xff, 0xff, 0xff) },
@@ -1305,58 +1169,58 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0010, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0011, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0012, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0013, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0016, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0017, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0018, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0019, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0020, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0021, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0022, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0023, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0024, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0025, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0028, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0029, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0030, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff,
-          0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_mf626_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626, 0xff, 0xff, 0xff),
+          .driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0032, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0033, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0034, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0037, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&zte_0037_blacklist },
+          .driver_info = NCTRL(0) | NCTRL(1) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0038, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0039, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0040, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0042, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0043, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0044, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0048, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0049, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0050, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0051, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0052, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0054, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0055, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0056, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0057, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0058, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0061, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0062, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0063, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0064, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0065, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0066, 0xff, 0xff, 0xff) },
@@ -1381,26 +1245,26 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0096, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0097, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0104, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0105, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0106, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0108, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0113, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0117, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0118, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0121, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0122, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0123, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0124, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0125, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
+          .driver_info = RSVD(6) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0126, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0128, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0135, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0136, 0xff, 0xff, 0xff) },
@@ -1416,50 +1280,50 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0155, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0156, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0157, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0158, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0159, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0161, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0162, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0164, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0165, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0167, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0189, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0191, 0xff, 0xff, 0xff), /* ZTE EuFi890 */
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0196, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0197, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0199, 0xff, 0xff, 0xff), /* ZTE MF820S */
-          .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0200, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0201, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0254, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */
-          .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff), /* ONDA MT8205 */
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff), /* ZTE MF880 */
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0330, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0395, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0412, 0xff, 0xff, 0xff), /* Telewell TW-LTE 4G */
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0414, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0417, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1018, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1021, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
+          .driver_info = RSVD(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1057, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1058, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1059, 0xff, 0xff, 0xff) },
@@ -1576,23 +1440,23 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1170, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1244, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1245, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1246, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1247, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1248, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1249, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1250, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1251, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1252, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1253, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1254, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1255, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&zte_1255_blacklist },
+          .driver_info = RSVD(3) | RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1256, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1257, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1258, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1259, 0xff, 0xff, 0xff) },
@@ -1607,7 +1471,7 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1268, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1269, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1270, 0xff, 0xff, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1271, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1272, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1273, 0xff, 0xff, 0xff) },
@@ -1643,17 +1507,17 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1303, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1333, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1401, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
+          .driver_info = RSVD(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1402, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
+          .driver_info = RSVD(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1424, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
+          .driver_info = RSVD(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1425, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
+          .driver_info = RSVD(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1426, 0xff, 0xff, 0xff),  /* ZTE MF91 */
-                .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
+          .driver_info = RSVD(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1428, 0xff, 0xff, 0xff),  /* Telewell TW-LTE 4G v2 */
-                .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
+          .driver_info = RSVD(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1533, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1534, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1535, 0xff, 0xff, 0xff) },
@@ -1671,8 +1535,8 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1596, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1598, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1600, 0xff, 0xff, 0xff) },
-        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff,
-          0xff, 0xff), .driver_info = (kernel_ulong_t)&zte_k3765_z_blacklist },
+        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2002, 0xff, 0xff, 0xff),
+          .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x2003, 0xff, 0xff, 0xff) },
 
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0014, 0xff, 0xff, 0xff) }, /* ZTE CDMA products */
@@ -1683,20 +1547,20 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0073, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0094, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0130, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
+          .driver_info = RSVD(1) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0133, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0141, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0147, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0152, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0168, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0170, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0176, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0178, 0xff, 0xff, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff42, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff43, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff44, 0xff, 0xff, 0xff) },
@@ -1848,19 +1712,19 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T, 0xff, 0xff, 0xff) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2718, 0xff, 0xff, 0xff),
-         .driver_info = (kernel_ulong_t)&zte_mc2718_z_blacklist },
+         .driver_info = NCTRL(1) | NCTRL(2) | NCTRL(3) | NCTRL(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AD3812, 0xff, 0xff, 0xff),
-         .driver_info = (kernel_ulong_t)&zte_ad3812_z_blacklist },
+         .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) },
         { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MC2716, 0xff, 0xff, 0xff),
-         .driver_info = (kernel_ulong_t)&zte_mc2716_z_blacklist },
+         .driver_info = NCTRL(1) | NCTRL(2) | NCTRL(3) },
         { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ME3620_L),
-         .driver_info = (kernel_ulong_t)&zte_me3620_xl_blacklist },
+         .driver_info = RSVD(3) | RSVD(4) | RSVD(5) },
         { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ME3620_MBIM),
-         .driver_info = (kernel_ulong_t)&zte_me3620_mbim_blacklist },
+         .driver_info = RSVD(2) | RSVD(3) | RSVD(4) },
         { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ME3620_X),
-         .driver_info = (kernel_ulong_t)&zte_me3620_xl_blacklist },
+         .driver_info = RSVD(3) | RSVD(4) | RSVD(5) },
         { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_ZM8620_X),
-         .driver_info = (kernel_ulong_t)&zte_zm8620_x_blacklist },
+         .driver_info = RSVD(3) | RSVD(4) | RSVD(5) },
         { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x01) },
         { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x02, 0x05) },
         { USB_VENDOR_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xff, 0x86, 0x10) },
@@ -1880,37 +1744,34 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(ALINK_VENDOR_ID, ALINK_PRODUCT_PH300) },
         { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) },
         { USB_DEVICE(ALINK_VENDOR_ID, SIMCOM_PRODUCT_SIM7100E),
-          .driver_info = (kernel_ulong_t)&simcom_sim7100e_blacklist },
+          .driver_info = RSVD(5) | RSVD(6) },
         { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
-          .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist
-        },
+          .driver_info = NCTRL(0) | NCTRL(1) | RSVD(4) },
         { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D),
-          .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
+          .driver_info = RSVD(6) },
         { USB_DEVICE(ALCATEL_VENDOR_ID, 0x0052),
-          .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
+          .driver_info = RSVD(6) },
         { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b6),
-          .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE(ALCATEL_VENDOR_ID, 0x00b7),
-          .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
+          .driver_info = RSVD(5) },
         { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L800MA),
-          .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
+          .driver_info = RSVD(2) },
         { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
         { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
         { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
-          .driver_info = (kernel_ulong_t)&four_g_w14_blacklist
-        },
+          .driver_info = NCTRL(0) | NCTRL(1) },
         { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W100),
-          .driver_info = (kernel_ulong_t)&four_g_w100_blacklist
-        },
+          .driver_info = NCTRL(1) | NCTRL(2) | RSVD(3) },
         {USB_DEVICE(LONGCHEER_VENDOR_ID, FUJISOFT_PRODUCT_FS040U),
-         .driver_info = (kernel_ulong_t)&net_intf3_blacklist},
+         .driver_info = RSVD(3)},
         { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) },
         { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9801, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
+          .driver_info = RSVD(3) },
         { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9803, 0xff),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(LONGCHEER_VENDOR_ID, ZOOM_PRODUCT_4597) },
         { USB_DEVICE(LONGCHEER_VENDOR_ID, IBALL_3_5G_CONNECT) },
         { USB_DEVICE(HAIER_VENDOR_ID, HAIER_PRODUCT_CE100) },
@@ -1936,14 +1797,14 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) },
         { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) },
         { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX, 0xff) },
         { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PLXX),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8_2RMNET, 0xff),
-                .driver_info = (kernel_ulong_t)&cinterion_rmnet2_blacklist },
+          .driver_info = RSVD(4) | RSVD(5) },
         { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8_AUDIO, 0xff),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_2RMNET, 0xff) },
         { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_AHXX_AUDIO, 0xff) },
         { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) },
@@ -1953,20 +1814,20 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */
         { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD140),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD145) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD155),
-                .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
+          .driver_info = RSVD(6) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD200),
-                .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
+          .driver_info = RSVD(6) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD160),
-                .driver_info = (kernel_ulong_t)&net_intf6_blacklist },
+          .driver_info = RSVD(6) },
         { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD500),
-                .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
         { USB_DEVICE_AND_INTERFACE_INFO(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_GT_B3730, USB_CLASS_CDC_DATA, 0x00, 0x00) }, /* Samsung GT-B3730 LTE USB modem.*/
         { USB_DEVICE(YUGA_VENDOR_ID, YUGA_PRODUCT_CEM600) },
@@ -2043,9 +1904,9 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T_600E) },
         { USB_DEVICE_AND_INTERFACE_INFO(TPLINK_VENDOR_ID, TPLINK_PRODUCT_LTE, 0xff, 0x00, 0x00) },      /* TP-Link LTE Module */
         { USB_DEVICE(TPLINK_VENDOR_ID, TPLINK_PRODUCT_MA180),
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(TPLINK_VENDOR_ID, 0x9000),                                 /* TP-Link MA260 */
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE(CHANGHONG_VENDOR_ID, CHANGHONG_PRODUCT_CH690) },
         { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) },                   /* D-Link DWM-156 (variant) */
         { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) },
@@ -2053,9 +1914,9 @@ static const struct usb_device_id option_ids[] = {
         { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d04, 0xff) },                   /* D-Link DWM-158 */
         { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d0e, 0xff) },                   /* D-Link DWM-157 C1 */
         { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e19, 0xff),                     /* D-Link DWM-221 B1 */
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff),                     /* D-Link DWM-222 */
-          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+          .driver_info = RSVD(4) },
         { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */
         { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */
         { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */
@@ -2114,11 +1975,10 @@ static int option_probe(struct usb_serial *serial,
 {
         struct usb_interface_descriptor *iface_desc =
                                 &serial->interface->cur_altsetting->desc;
-        struct usb_device_descriptor *dev_desc = &serial->dev->descriptor;
-        const struct option_blacklist_info *blacklist;
+        unsigned long device_flags = id->driver_info;
 
         /* Never bind to the CD-Rom emulation interface */
-        if (iface_desc->bInterfaceClass == 0x08)
+        if (iface_desc->bInterfaceClass == USB_CLASS_MASS_STORAGE)
                 return -ENODEV;
 
         /*
@@ -2126,21 +1986,11 @@ static int option_probe(struct usb_serial *serial,
          * the same class/subclass/protocol as the serial interfaces.  Look at
          * the Windows driver .INF files for reserved interface numbers.
          */
-        blacklist = (void *)id->driver_info;
-        if (blacklist && test_bit(iface_desc->bInterfaceNumber,
-                                                &blacklist->reserved))
-                return -ENODEV;
-        /*
-         * Don't bind network interface on Samsung GT-B3730, it is handled by
-         * a separate module.
-         */
-        if (dev_desc->idVendor == cpu_to_le16(SAMSUNG_VENDOR_ID) &&
-            dev_desc->idProduct == cpu_to_le16(SAMSUNG_PRODUCT_GT_B3730) &&
-            iface_desc->bInterfaceClass != USB_CLASS_CDC_DATA)
+        if (device_flags & RSVD(iface_desc->bInterfaceNumber))
                 return -ENODEV;
 
-        /* Store the blacklist info so we can use it during attach. */
-        usb_set_serial_data(serial, (void *)blacklist);
+        /* Store the device flags so we can use them during attach. */
+        usb_set_serial_data(serial, (void *)device_flags);
 
         return 0;
 }
@@ -2148,22 +1998,21 @@ static int option_probe(struct usb_serial *serial,
 static int option_attach(struct usb_serial *serial)
 {
         struct usb_interface_descriptor *iface_desc;
-        const struct option_blacklist_info *blacklist;
         struct usb_wwan_intf_private *data;
+        unsigned long device_flags;
 
         data = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
-        /* Retrieve blacklist info stored at probe. */
-        blacklist = usb_get_serial_data(serial);
+        /* Retrieve device flags stored at probe. */
+        device_flags = (unsigned long)usb_get_serial_data(serial);
 
         iface_desc = &serial->interface->cur_altsetting->desc;
 
-        if (!blacklist || !test_bit(iface_desc->bInterfaceNumber,
-                                                &blacklist->sendsetup)) {
+        if (!(device_flags & NCTRL(iface_desc->bInterfaceNumber)))
                 data->use_send_setup = 1;
-        }
+
         spin_lock_init(&data->susp_lock);
 
         usb_set_serial_data(serial, data);