tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
NFC: pn533: Convert to use USB_DEVICE macro
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
authored by
Axel Lin
and committed by
Samuel Ortiz
99968e06
4aa7ed02
+8
-20
+8
-20
drivers/nfc/pn533.c
+8
-20
drivers/nfc/pn533.c
···
55
55
NFC_PROTO_NFC_DEP_MASK)
56
56
57
57
static const struct usb_device_id pn533_table[] = {
58
-
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
59
-
.idVendor = PN533_VENDOR_ID,
60
-
.idProduct = PN533_PRODUCT_ID,
61
-
.driver_info = PN533_DEVICE_STD,
62
-
},
63
-
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
64
-
.idVendor = SCM_VENDOR_ID,
65
-
.idProduct = SCL3711_PRODUCT_ID,
66
-
.driver_info = PN533_DEVICE_STD,
67
-
},
68
-
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
69
-
.idVendor = SONY_VENDOR_ID,
70
-
.idProduct = PASORI_PRODUCT_ID,
71
-
.driver_info = PN533_DEVICE_PASORI,
72
-
},
73
-
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
74
-
.idVendor = ACS_VENDOR_ID,
75
-
.idProduct = ACR122U_PRODUCT_ID,
76
-
.driver_info = PN533_DEVICE_ACR122U,
77
-
},
58
+
{ USB_DEVICE(PN533_VENDOR_ID, PN533_PRODUCT_ID),
59
+
.driver_info = PN533_DEVICE_STD },
60
+
{ USB_DEVICE(SCM_VENDOR_ID, SCL3711_PRODUCT_ID),
61
+
.driver_info = PN533_DEVICE_STD },
62
+
{ USB_DEVICE(SONY_VENDOR_ID, PASORI_PRODUCT_ID),
63
+
.driver_info = PN533_DEVICE_PASORI },
64
+
{ USB_DEVICE(ACS_VENDOR_ID, ACR122U_PRODUCT_ID),
65
+
.driver_info = PN533_DEVICE_ACR122U },
78
66
{ }
79
67
};
80
68
MODULE_DEVICE_TABLE(usb, pn533_table);