From: Petko Manolov <petko.manolov@konsulko.com>
To: gregKH@linuxfoundation.org
Cc: linux-usb@vger.kernel.org, davem@davemloft.net,
netdev@vger.kernel.org,
Petko Manolov <petko.manolov@konsulko.com>
Subject: [PATCH RESEND v3 2/2] net: rtl8150: Use the new usb control message API.
Date: Sun, 27 Sep 2020 15:49:09 +0300 [thread overview]
Message-ID: <20200927124909.16380-3-petko.manolov@konsulko.com> (raw)
In-Reply-To: <20200927124909.16380-1-petko.manolov@konsulko.com>
The old usb_control_msg() let the caller handle the error and also did not
account for partial reads. Since these are now considered harmful, move the
driver over to usb_control_msg_recv/send() calls.
Signed-off-by: Petko Manolov <petko.manolov@konsulko.com>
---
drivers/net/usb/rtl8150.c | 32 ++++++--------------------------
1 file changed, 6 insertions(+), 26 deletions(-)
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 733f120c852b..b3a0b188b1a1 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -152,36 +152,16 @@ static const char driver_name [] = "rtl8150";
*/
static int get_registers(rtl8150_t * dev, u16 indx, u16 size, void *data)
{
- void *buf;
- int ret;
-
- buf = kmalloc(size, GFP_NOIO);
- if (!buf)
- return -ENOMEM;
-
- ret = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
- RTL8150_REQ_GET_REGS, RTL8150_REQT_READ,
- indx, 0, buf, size, 500);
- if (ret > 0 && ret <= size)
- memcpy(data, buf, ret);
- kfree(buf);
- return ret;
+ return usb_control_msg_recv(dev->udev, 0, RTL8150_REQ_GET_REGS,
+ RTL8150_REQT_READ, indx, 0, data, size,
+ 1000, GFP_NOIO);
}
static int set_registers(rtl8150_t * dev, u16 indx, u16 size, const void *data)
{
- void *buf;
- int ret;
-
- buf = kmemdup(data, size, GFP_NOIO);
- if (!buf)
- return -ENOMEM;
-
- ret = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
- RTL8150_REQ_SET_REGS, RTL8150_REQT_WRITE,
- indx, 0, buf, size, 500);
- kfree(buf);
- return ret;
+ return usb_control_msg_send(dev->udev, 0, RTL8150_REQ_SET_REGS,
+ RTL8150_REQT_WRITE, indx, 0, data, size,
+ 1000, GFP_NOIO);
}
static void async_set_reg_cb(struct urb *urb)
--
2.28.0
next prev parent reply other threads:[~2020-09-27 12:49 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200923134348.23862-9-oneukum@suse.com>
2020-09-27 12:49 ` [PATCH RESEND v3 0/2] Use the new usb control message API Petko Manolov
2020-09-27 12:49 ` [PATCH RESEND v3 1/2] net: pegasus: " Petko Manolov
2020-09-27 12:49 ` Petko Manolov [this message]
2020-09-28 23:00 ` [PATCH RESEND v3 0/2] " David Miller
2020-09-29 4:59 ` Petko Manolov
2020-09-29 19:58 ` David Miller
2020-09-30 6:23 ` Greg KH
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=20200927124909.16380-3-petko.manolov@konsulko.com \
--to=petko.manolov@konsulko.com \
--cc=davem@davemloft.net \
--cc=gregKH@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).