* [PATCH net-next 0/2] r8152: improve the code
@ 2023-01-19 7:40 Hayes Wang
2023-01-19 7:40 ` [PATCH net-next 1/2] r8152: remove rtl_vendor_mode function Hayes Wang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Hayes Wang @ 2023-01-19 7:40 UTC (permalink / raw)
To: kuba, davem
Cc: netdev, nic_swsd, linux-kernel, linux-usb, edumazet, pabeni, Hayes Wang
These are some minor improvements depending on commit ec51fbd1b8a2 ("r8152:
add USB device driver for config selection").
Hayes Wang (2):
r8152: remove rtl_vendor_mode function
r8152: reduce the control transfer of rtl8152_get_version()
drivers/net/usb/r8152.c | 46 +++++------------------------------------
1 file changed, 5 insertions(+), 41 deletions(-)
--
2.38.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH net-next 1/2] r8152: remove rtl_vendor_mode function
2023-01-19 7:40 [PATCH net-next 0/2] r8152: improve the code Hayes Wang
@ 2023-01-19 7:40 ` Hayes Wang
2023-01-19 7:40 ` [PATCH net-next 2/2] r8152: reduce the control transfer of rtl8152_get_version() Hayes Wang
2023-01-21 2:10 ` [PATCH net-next 0/2] r8152: improve the code patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Hayes Wang @ 2023-01-19 7:40 UTC (permalink / raw)
To: kuba, davem
Cc: netdev, nic_swsd, linux-kernel, linux-usb, edumazet, pabeni, Hayes Wang
After commit ec51fbd1b8a2 ("r8152: add USB device driver for
config selection"), the code about changing USB configuration
in rtl_vendor_mode() wouldn't be run anymore. Therefore, the
function could be removed.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
drivers/net/usb/r8152.c | 39 +--------------------------------------
1 file changed, 1 insertion(+), 38 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 4c5c1df5d7a4..6e5e12d90d47 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -8232,43 +8232,6 @@ static bool rtl_check_vendor_ok(struct usb_interface *intf)
return true;
}
-static bool rtl_vendor_mode(struct usb_interface *intf)
-{
- struct usb_host_interface *alt = intf->cur_altsetting;
- struct usb_device *udev;
- struct usb_host_config *c;
- int i, num_configs;
-
- if (alt->desc.bInterfaceClass == USB_CLASS_VENDOR_SPEC)
- return rtl_check_vendor_ok(intf);
-
- /* The vendor mode is not always config #1, so to find it out. */
- udev = interface_to_usbdev(intf);
- c = udev->config;
- num_configs = udev->descriptor.bNumConfigurations;
- if (num_configs < 2)
- return false;
-
- for (i = 0; i < num_configs; (i++, c++)) {
- struct usb_interface_descriptor *desc = NULL;
-
- if (c->desc.bNumInterfaces > 0)
- desc = &c->intf_cache[0]->altsetting->desc;
- else
- continue;
-
- if (desc->bInterfaceClass == USB_CLASS_VENDOR_SPEC) {
- usb_driver_set_configuration(udev, c->desc.bConfigurationValue);
- break;
- }
- }
-
- if (i == num_configs)
- dev_err(&intf->dev, "Unexpected Device\n");
-
- return false;
-}
-
static int rtl8152_pre_reset(struct usb_interface *intf)
{
struct r8152 *tp = usb_get_intfdata(intf);
@@ -9629,7 +9592,7 @@ static int rtl8152_probe(struct usb_interface *intf,
if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)
return -ENODEV;
- if (!rtl_vendor_mode(intf))
+ if (!rtl_check_vendor_ok(intf))
return -ENODEV;
usb_reset_device(udev);
--
2.38.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH net-next 2/2] r8152: reduce the control transfer of rtl8152_get_version()
2023-01-19 7:40 [PATCH net-next 0/2] r8152: improve the code Hayes Wang
2023-01-19 7:40 ` [PATCH net-next 1/2] r8152: remove rtl_vendor_mode function Hayes Wang
@ 2023-01-19 7:40 ` Hayes Wang
2023-01-21 2:10 ` [PATCH net-next 0/2] r8152: improve the code patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Hayes Wang @ 2023-01-19 7:40 UTC (permalink / raw)
To: kuba, davem
Cc: netdev, nic_swsd, linux-kernel, linux-usb, edumazet, pabeni, Hayes Wang
Reduce the control transfer by moving calling rtl8152_get_version() in
rtl8152_probe(). This could prevent from calling rtl8152_get_version()
for unnecessary situations. For example, after setting config #2 for the
device, there are two interfaces and rtl8152_probe() may be called
twice. However, we don't need to call rtl8152_get_version() for this
situation.
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
drivers/net/usb/r8152.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 6e5e12d90d47..decb5ba56a25 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -9581,20 +9581,21 @@ static int rtl8152_probe(struct usb_interface *intf,
const struct usb_device_id *id)
{
struct usb_device *udev = interface_to_usbdev(intf);
- u8 version = rtl8152_get_version(intf);
struct r8152 *tp;
struct net_device *netdev;
+ u8 version;
int ret;
- if (version == RTL_VER_UNKNOWN)
- return -ENODEV;
-
if (intf->cur_altsetting->desc.bInterfaceClass != USB_CLASS_VENDOR_SPEC)
return -ENODEV;
if (!rtl_check_vendor_ok(intf))
return -ENODEV;
+ version = rtl8152_get_version(intf);
+ if (version == RTL_VER_UNKNOWN)
+ return -ENODEV;
+
usb_reset_device(udev);
netdev = alloc_etherdev(sizeof(struct r8152));
if (!netdev) {
--
2.38.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH net-next 0/2] r8152: improve the code
2023-01-19 7:40 [PATCH net-next 0/2] r8152: improve the code Hayes Wang
2023-01-19 7:40 ` [PATCH net-next 1/2] r8152: remove rtl_vendor_mode function Hayes Wang
2023-01-19 7:40 ` [PATCH net-next 2/2] r8152: reduce the control transfer of rtl8152_get_version() Hayes Wang
@ 2023-01-21 2:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-01-21 2:10 UTC (permalink / raw)
To: Hayes Wang
Cc: kuba, davem, netdev, nic_swsd, linux-kernel, linux-usb, edumazet, pabeni
Hello:
This series was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Thu, 19 Jan 2023 15:40:41 +0800 you wrote:
> These are some minor improvements depending on commit ec51fbd1b8a2 ("r8152:
> add USB device driver for config selection").
>
> Hayes Wang (2):
> r8152: remove rtl_vendor_mode function
> r8152: reduce the control transfer of rtl8152_get_version()
>
> [...]
Here is the summary with links:
- [net-next,1/2] r8152: remove rtl_vendor_mode function
https://git.kernel.org/netdev/net-next/c/95a4c1d617b9
- [net-next,2/2] r8152: reduce the control transfer of rtl8152_get_version()
https://git.kernel.org/netdev/net-next/c/02767440e1dd
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-21 2:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-19 7:40 [PATCH net-next 0/2] r8152: improve the code Hayes Wang
2023-01-19 7:40 ` [PATCH net-next 1/2] r8152: remove rtl_vendor_mode function Hayes Wang
2023-01-19 7:40 ` [PATCH net-next 2/2] r8152: reduce the control transfer of rtl8152_get_version() Hayes Wang
2023-01-21 2:10 ` [PATCH net-next 0/2] r8152: improve the code patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.