From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-staging@lists.linux.dev
Cc: Larry Finger <Larry.Finger@lwfinger.net>,
Phillip Potter <phil@philpotter.co.uk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 12/12] staging: r8188eu: remove rtw_usb_control_msg() macro
Date: Fri, 30 Jul 2021 11:24:17 +0200 [thread overview]
Message-ID: <20210730092417.1014392-12-gregkh@linuxfoundation.org> (raw)
In-Reply-To: <20210730092417.1014392-1-gregkh@linuxfoundation.org>
It is a wrapper around usb_control_msg() that does nothing, so remove
the macro and just call the correct USB function instead in the one
place it is used.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/r8188eu/hal/usb_ops_linux.c | 2 +-
drivers/staging/r8188eu/include/usb_ops.h | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index dd6138dfebb6..3c6abedb313d 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -56,7 +56,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u
memcpy(pIo_buf, pdata, len);
}
- status = rtw_usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
+ status = usb_control_msg(udev, pipe, request, reqtype, value, index, pIo_buf, len, RTW_USB_CONTROL_MSG_TIMEOUT);
if (status == len) { /* Success this control transfer. */
rtw_reset_continual_urb_error(dvobjpriv);
diff --git a/drivers/staging/r8188eu/include/usb_ops.h b/drivers/staging/r8188eu/include/usb_ops.h
index d5b31e31b62d..6267d0999400 100644
--- a/drivers/staging/r8188eu/include/usb_ops.h
+++ b/drivers/staging/r8188eu/include/usb_ops.h
@@ -21,10 +21,6 @@ enum {
#define MAX_VENDOR_REQ_CMD_SIZE 254 /* 8188cu SIE Support */
#define MAX_USB_IO_CTL_SIZE (MAX_VENDOR_REQ_CMD_SIZE + ALIGNMENT_UNIT)
-#define rtw_usb_control_msg(dev, pipe, request, requesttype, \
- value, index, data, size, timeout_ms) \
- usb_control_msg((dev), (pipe), (request), (requesttype), (value),\
- (index), (data), (size), (timeout_ms))
#include <usb_ops_linux.h>
void rtl8188eu_set_hw_type(struct adapter *padapter);
--
2.32.0
prev parent reply other threads:[~2021-07-30 9:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 9:24 [PATCH 01/12] staging: r8188eu: remove empty ODM_ResetIQKResult() function Greg Kroah-Hartman
2021-07-30 9:24 ` [PATCH 02/12] staging: r8188eu: move ODM_TARGET_CHNL_NUM_2G_5G Greg Kroah-Hartman
2021-07-30 9:24 ` [PATCH 03/12] staging: r8188eu: move ODM_GetRightChnlPlaceforIQK() Greg Kroah-Hartman
2021-07-30 9:24 ` [PATCH 04/12] staging: r8188eu: remove include/h2clbk.h Greg Kroah-Hartman
2021-07-30 9:24 ` [PATCH 05/12] staging: r8188eu: remove include/autoconf.h Greg Kroah-Hartman
2021-07-30 9:24 ` [PATCH 06/12] staging: r8188eu: remove include/Hal8188EReg.h Greg Kroah-Hartman
2021-07-30 9:24 ` [PATCH 07/12] staging: r8188eu: remove rtw_mfree2d() function Greg Kroah-Hartman
2021-07-30 9:24 ` [PATCH 08/12] staging: r8188eu: remove rtw_buf_free() function Greg Kroah-Hartman
2021-07-30 9:24 ` [PATCH 09/12] staging: r8188eu: remove unused enum _NIC_VERSION Greg Kroah-Hartman
2021-07-30 9:24 ` [PATCH 10/12] staging: r8188eu: remove include/nic_spec.h Greg Kroah-Hartman
2021-07-30 9:24 ` [PATCH 11/12] staging: r8188eu: remove rtw_usb_bulk_msg() macro Greg Kroah-Hartman
2021-07-30 9:24 ` Greg Kroah-Hartman [this message]
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=20210730092417.1014392-12-gregkh@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=Larry.Finger@lwfinger.net \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/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).