linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Himadri Pandya <himadrispandya@gmail.com>
To: johan@kernel.org, gregkh@linuxfoundation.org,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: linux-kernel-mentees@lists.linuxfoundation.org,
	Himadri Pandya <himadrispandya@gmail.com>
Subject: [PATCH 12/15] usb: serial: ipw: use usb_control_msg_send()
Date: Wed,  4 Nov 2020 12:17:00 +0530	[thread overview]
Message-ID: <20201104064703.15123-13-himadrispandya@gmail.com> (raw)
In-Reply-To: <20201104064703.15123-1-himadrispandya@gmail.com>

The new usb_control_msg_send() nicely wraps usb_control_msg() with proper
error check. Hence use the wrapper instead of calling usb_control_msg()
directly.

Signed-off-by: Himadri Pandya <himadrispandya@gmail.com>
---
 drivers/usb/serial/ipw.c | 107 +++++++++++++--------------------------
 1 file changed, 36 insertions(+), 71 deletions(-)

diff --git a/drivers/usb/serial/ipw.c b/drivers/usb/serial/ipw.c
index d04c7cc5c1c2..3c3895b4dff8 100644
--- a/drivers/usb/serial/ipw.c
+++ b/drivers/usb/serial/ipw.c
@@ -134,26 +134,16 @@ static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port)
 	struct usb_device *udev = port->serial->dev;
 	struct device *dev = &port->dev;
 	u8 buf_flow_static[16] = IPW_BYTES_FLOWINIT;
-	u8 *buf_flow_init;
 	int result;
 
-	buf_flow_init = kmemdup(buf_flow_static, 16, GFP_KERNEL);
-	if (!buf_flow_init)
-		return -ENOMEM;
-
 	/* --1: Tell the modem to initialize (we think) From sniffs this is
 	 *	always the first thing that gets sent to the modem during
 	 *	opening of the device */
 	dev_dbg(dev, "%s: Sending SIO_INIT (we guess)\n", __func__);
-	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-			 IPW_SIO_INIT,
-			 USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
-			 0,
-			 0, /* index */
-			 NULL,
-			 0,
-			 100000);
-	if (result < 0)
+	result = usb_control_msg_send(udev, 0, IPW_SIO_INIT, USB_TYPE_VENDOR |
+				      USB_RECIP_INTERFACE | USB_DIR_OUT, 0,
+				      0,  NULL, 0, 100000, GFP_KERNEL);
+	if (result)
 		dev_err(dev, "Init of modem failed (error = %d)\n", result);
 
 	/* reset the bulk pipes */
@@ -166,31 +156,22 @@ static int ipw_open(struct tty_struct *tty, struct usb_serial_port *port)
 
 	/*--3: Tell the modem to open the floodgates on the rx bulk channel */
 	dev_dbg(dev, "%s:asking modem for RxRead (RXBULK_ON)\n", __func__);
-	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-			 IPW_SIO_RXCTL,
-			 USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
-			 IPW_RXBULK_ON,
-			 0, /* index */
-			 NULL,
-			 0,
-			 100000);
-	if (result < 0)
+	result = usb_control_msg_send(udev, 0, IPW_SIO_RXCTL, USB_TYPE_VENDOR |
+				      USB_RECIP_INTERFACE | USB_DIR_OUT,
+				      IPW_RXBULK_ON, 0, NULL, 0, 100000,
+				      GFP_KERNEL);
+	if (result)
 		dev_err(dev, "Enabling bulk RxRead failed (error = %d)\n", result);
 
 	/*--4: setup the initial flowcontrol */
-	dev_dbg(dev, "%s:setting init flowcontrol (%s)\n", __func__, buf_flow_init);
-	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-			 IPW_SIO_HANDFLOW,
-			 USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
-			 0,
-			 0,
-			 buf_flow_init,
-			 0x10,
-			 200000);
-	if (result < 0)
+	dev_dbg(dev, "%s:setting init flowcontrol (%s)\n", __func__, buf_flow_static);
+	result = usb_control_msg_send(udev, 0, IPW_SIO_HANDFLOW,
+				      USB_TYPE_VENDOR | USB_RECIP_INTERFACE |
+				      USB_DIR_OUT, 0, 0, &buf_flow_static, 0x10,
+				      200000, GFP_KERNEL);
+	if (result)
 		dev_err(dev, "initial flowcontrol failed (error = %d)\n", result);
 
-	kfree(buf_flow_init);
 	return 0;
 }
 
@@ -223,26 +204,20 @@ static void ipw_dtr_rts(struct usb_serial_port *port, int on)
 
 	dev_dbg(dev, "%s: on = %d\n", __func__, on);
 
-	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-			 IPW_SIO_SET_PIN,
-			 USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
-			 on ? IPW_PIN_SETDTR : IPW_PIN_CLRDTR,
-			 0,
-			 NULL,
-			 0,
-			 200000);
-	if (result < 0)
+	result = usb_control_msg_send(udev, 0, IPW_SIO_SET_PIN,
+				      USB_TYPE_VENDOR | USB_RECIP_INTERFACE |
+				      USB_DIR_OUT,
+				      on ? IPW_PIN_SETDTR : IPW_PIN_CLRDTR, 0,
+				      NULL, 0, 200000, GFP_KERNEL);
+	if (result)
 		dev_err(dev, "setting dtr failed (error = %d)\n", result);
 
-	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-			 IPW_SIO_SET_PIN, USB_TYPE_VENDOR |
-					USB_RECIP_INTERFACE | USB_DIR_OUT,
-			 on ? IPW_PIN_SETRTS : IPW_PIN_CLRRTS,
-			 0,
-			 NULL,
-			 0,
-			 200000);
-	if (result < 0)
+	result = usb_control_msg_send(udev, 0, IPW_SIO_SET_PIN,
+				      USB_TYPE_VENDOR | USB_RECIP_INTERFACE |
+				      USB_DIR_OUT,
+				      on ? IPW_PIN_SETRTS : IPW_PIN_CLRRTS,
+				      0, NULL, 0, 200000, GFP_KERNEL);
+	if (result)
 		dev_err(dev, "setting rts failed (error = %d)\n", result);
 }
 
@@ -254,30 +229,20 @@ static void ipw_close(struct usb_serial_port *port)
 
 	/*--3: purge */
 	dev_dbg(dev, "%s:sending purge\n", __func__);
-	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-			 IPW_SIO_PURGE, USB_TYPE_VENDOR |
-			 		USB_RECIP_INTERFACE | USB_DIR_OUT,
-			 0x03,
-			 0,
-			 NULL,
-			 0,
-			 200000);
-	if (result < 0)
+	result = usb_control_msg_send(udev, 0, IPW_SIO_PURGE, USB_TYPE_VENDOR |
+				      USB_RECIP_INTERFACE | USB_DIR_OUT, 0x03,
+				      0, NULL, 0, 200000, GFP_KERNEL);
+	if (result)
 		dev_err(dev, "purge failed (error = %d)\n", result);
 
 
 	/* send RXBULK_off (tell modem to stop transmitting bulk data on
 	   rx chan) */
-	result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
-			 IPW_SIO_RXCTL,
-			 USB_TYPE_VENDOR | USB_RECIP_INTERFACE | USB_DIR_OUT,
-			 IPW_RXBULK_OFF,
-			 0, /* index */
-			 NULL,
-			 0,
-			 100000);
-
-	if (result < 0)
+	result = usb_control_msg_send(udev, 0, IPW_SIO_RXCTL, USB_TYPE_VENDOR |
+				      USB_RECIP_INTERFACE | USB_DIR_OUT,
+				      IPW_RXBULK_OFF, 0, NULL, 0, 100000, GFP_KERNEL);
+
+	if (result)
 		dev_err(dev, "Disabling bulk RxRead failed (error = %d)\n", result);
 
 	usb_wwan_close(port);
-- 
2.17.1


  parent reply	other threads:[~2020-11-04  6:48 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-04  6:46 [PATCH 00/15] usb: serial: avoid using usb_control_msg() directly Himadri Pandya
2020-11-04  6:46 ` [PATCH 01/15] usb: serial: ark3116: use usb_control_msg_recv() and usb_control_msg_send() Himadri Pandya
2020-12-04  9:16   ` Johan Hovold
2020-11-04  6:46 ` [PATCH 02/15] usb: serial: belkin_sa: use usb_control_msg_send() Himadri Pandya
2020-12-04  9:17   ` Johan Hovold
2020-11-04  6:46 ` [PATCH 03/15] usb: serial: ch314: use usb_control_msg_recv() and usb_control_msg_send() Himadri Pandya
2020-12-04  9:24   ` Johan Hovold
2020-11-04  6:46 ` [PATCH 04/15] usb: serial: cp210x: " Himadri Pandya
2020-12-04  9:34   ` Johan Hovold
2020-11-04  6:46 ` [PATCH 05/15] usb: serial: cypress_m8: " Himadri Pandya
2020-12-04  9:37   ` Johan Hovold
2020-11-04  6:46 ` [PATCH 06/15] usb: serial: f81232: " Himadri Pandya
2020-12-04  9:49   ` Johan Hovold
2020-11-04  6:46 ` [PATCH 07/15] usb: serial: f81534: " Himadri Pandya
2020-12-04  9:55   ` Johan Hovold
2020-11-04  6:46 ` [PATCH 08/15] usb: serial: ftdi_sio: " Himadri Pandya
2020-12-04 10:03   ` Johan Hovold
2020-11-04  6:46 ` [PATCH 09/15] usb: serial: io_edgeport: " Himadri Pandya
2020-12-04 10:10   ` Johan Hovold
2020-11-04  6:46 ` [PATCH 10/15] usb: serial: io_ti: " Himadri Pandya
2020-12-04 10:12   ` Johan Hovold
2020-11-04  6:46 ` [PATCH 11/15] usb: serial: ipaq: use usb_control_msg_send() Himadri Pandya
2020-12-04 10:21   ` Johan Hovold
2020-11-04  6:47 ` Himadri Pandya [this message]
2020-12-04 10:27   ` [PATCH 12/15] usb: serial: ipw: " Johan Hovold
2020-11-04  6:47 ` [PATCH 13/15] usb: serial: iuu_phoenix: " Himadri Pandya
2020-12-04 10:28   ` Johan Hovold
2020-11-04  6:47 ` [PATCH 14/15] usb: serial: keyspan_pda: use usb_control_msg_recv() and usb_control_msg_send() Himadri Pandya
2020-12-04 10:31   ` Johan Hovold
2020-11-04  6:47 ` [PATCH 15/15] usb: serial: kl5kusb105: " Himadri Pandya
2020-12-04 10:37   ` Johan Hovold
2020-11-06 10:43 ` [PATCH 00/15] usb: serial: avoid using usb_control_msg() directly Greg KH
2020-12-04  9:09 ` Johan Hovold
2020-12-24 10:01   ` Himadri Pandya

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=20201104064703.15123-13-himadrispandya@gmail.com \
    --to=himadrispandya@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=johan@kernel.org \
    --cc=linux-kernel-mentees@lists.linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@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).