From: Kai-Heng Feng <kai.heng.feng@canonical.com>
To: davem@davemloft.net, oliver@neukum.org
Cc: hayeswang@realtek.com, linux-usb@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Kai-Heng Feng <kai.heng.feng@canonical.com>
Subject: [PATCH 1/2] r8152: Pass driver_info to REALTEK_USB_DEVICE() macro
Date: Fri, 25 Oct 2019 18:59:18 +0800 [thread overview]
Message-ID: <20191025105919.689-1-kai.heng.feng@canonical.com> (raw)
REALTEK_USB_DEVICE() in current form doesn't take driver_info as its
parameter.
However, driver_info can be useful to add device specific information so
let's adjust REALTEK_USB_DEVICE() macro to be able to do that.
It'll be used by later patch.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
drivers/net/usb/r8152.c | 38 ++++++++++++++++++++------------------
1 file changed, 20 insertions(+), 18 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index d3c30ccc8577..1a987d4e45ab 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -6725,12 +6725,13 @@ static void rtl8152_disconnect(struct usb_interface *intf)
}
}
-#define REALTEK_USB_DEVICE(vend, prod) \
+#define REALTEK_USB_DEVICE(vend, prod, info) \
.match_flags = USB_DEVICE_ID_MATCH_DEVICE | \
USB_DEVICE_ID_MATCH_INT_CLASS, \
.idVendor = (vend), \
.idProduct = (prod), \
- .bInterfaceClass = USB_CLASS_VENDOR_SPEC \
+ .bInterfaceClass = USB_CLASS_VENDOR_SPEC, \
+ .driver_info = (info) \
}, \
{ \
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO | \
@@ -6739,25 +6740,26 @@ static void rtl8152_disconnect(struct usb_interface *intf)
.idProduct = (prod), \
.bInterfaceClass = USB_CLASS_COMM, \
.bInterfaceSubClass = USB_CDC_SUBCLASS_ETHERNET, \
- .bInterfaceProtocol = USB_CDC_PROTO_NONE
+ .bInterfaceProtocol = USB_CDC_PROTO_NONE, \
+ .driver_info = (info) \
/* table of devices that work with this driver */
static const struct usb_device_id rtl8152_table[] = {
- {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8050)},
- {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8152)},
- {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
- {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},
- {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},
- {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
- {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
- {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
- {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3069)},
- {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7205)},
- {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x720c)},
- {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7214)},
- {REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041)},
- {REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff)},
- {REALTEK_USB_DEVICE(VENDOR_ID_TPLINK, 0x0601)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8050, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8152, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3069, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7205, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x720c, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7214, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_LINKSYS, 0x0041, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_NVIDIA, 0x09ff, 0)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_TPLINK, 0x0601, 0)},
{}
};
--
2.17.1
next reply other threads:[~2019-10-25 11:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 10:59 Kai-Heng Feng [this message]
2019-10-25 10:59 ` [PATCH 2/2] r8152: Add macpassthru support for ThinkPad Thunderbolt 3 Dock Gen 2 Kai-Heng Feng
2019-10-28 3:58 ` Hayes Wang
2019-10-28 4:58 ` Kai-Heng Feng
2019-10-28 9:21 ` Hayes Wang
2019-10-28 9:41 ` [PATCH 1/2] r8152: Pass driver_info to REALTEK_USB_DEVICE() macro Hayes Wang
2019-10-28 9:52 ` Kai-Heng Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191025105919.689-1-kai.heng.feng@canonical.com \
--to=kai.heng.feng@canonical.com \
--cc=davem@davemloft.net \
--cc=hayeswang@realtek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oliver@neukum.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox