lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NFC: pn533: Convert to use USB_DEVICE macro

Browse Source 
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Axel Lin
2014-02-14 17:40:48 +08:00
committed by Samuel Ortiz
parent 4aa7ed02f5
commit 99968e0616
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/nfc/pn533.c
View File

@@ -55,26 +55,14 @@
NFC_PROTO_NFC_DEP_MASK) NFC_PROTO_NFC_DEP_MASK)
static const struct usb_device_id pn533_table[] = { static const struct usb_device_id pn533_table[] = {
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE, { USB_DEVICE(PN533_VENDOR_ID, PN533_PRODUCT_ID),
.idVendor = PN533_VENDOR_ID, .driver_info = PN533_DEVICE_STD },
.idProduct = PN533_PRODUCT_ID, { USB_DEVICE(SCM_VENDOR_ID, SCL3711_PRODUCT_ID),
.driver_info = PN533_DEVICE_STD, .driver_info = PN533_DEVICE_STD },
}, { USB_DEVICE(SONY_VENDOR_ID, PASORI_PRODUCT_ID),
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE, .driver_info = PN533_DEVICE_PASORI },
.idVendor = SCM_VENDOR_ID, { USB_DEVICE(ACS_VENDOR_ID, ACR122U_PRODUCT_ID),
.idProduct = SCL3711_PRODUCT_ID, .driver_info = PN533_DEVICE_ACR122U },
.driver_info = PN533_DEVICE_STD,
},
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
.idVendor = SONY_VENDOR_ID,
.idProduct = PASORI_PRODUCT_ID,
.driver_info = PN533_DEVICE_PASORI,
},
{ .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
.idVendor = ACS_VENDOR_ID,
.idProduct = ACR122U_PRODUCT_ID,
.driver_info = PN533_DEVICE_ACR122U,
},
{ } { }
}; };
MODULE_DEVICE_TABLE(usb, pn533_table); MODULE_DEVICE_TABLE(usb, pn533_table);