net: cx82310_eth: use common match macro
authorBjørn Mork <bjorn@mork.no>
Sun, 2 Sep 2012 23:20:31 +0000 (23:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 3 Sep 2012 17:51:02 +0000 (13:51 -0400)
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/cx82310_eth.c

index 49ab45e17fe8999c6da7281773c4be8c4da2cee3..1e207f086b759416a916cb9180af1be85e8a3fce 100644 (file)
@@ -302,18 +302,9 @@ static const struct driver_info    cx82310_info = {
        .tx_fixup       = cx82310_tx_fixup,
 };
 
-#define USB_DEVICE_CLASS(vend, prod, cl, sc, pr) \
-       .match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
-                      USB_DEVICE_ID_MATCH_DEV_INFO, \
-       .idVendor = (vend), \
-       .idProduct = (prod), \
-       .bDeviceClass = (cl), \
-       .bDeviceSubClass = (sc), \
-       .bDeviceProtocol = (pr)
-
 static const struct usb_device_id products[] = {
        {
-               USB_DEVICE_CLASS(0x0572, 0xcb01, 0xff, 0, 0),
+               USB_DEVICE_AND_INTERFACE_INFO(0x0572, 0xcb01, 0xff, 0, 0),
                .driver_info = (unsigned long) &cx82310_info
        },
        { },