From: Larry Finger <Larry.Finger@lwfinger.net>
To: gregkh@linuxfoundation.org
Cc: phil@philpotter.co.uk, linux-staging@lists.linux.dev,
linux-kernel@vger.kernel.org,
Larry Finger <Larry.Finger@lwfinger.net>
Subject: [PATCH 3/6] staging: r8188eu: Remove include/rtw_qos.h
Date: Thu, 29 Jul 2021 12:09:27 -0500 [thread overview]
Message-ID: <20210729170930.23171-4-Larry.Finger@lwfinger.net> (raw)
In-Reply-To: <20210729170930.23171-1-Larry.Finger@lwfinger.net>
This header file merely defines a single struct. Move that definition
to the header file that uses it, and delete rtw_qos.h.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---
drivers/staging/r8188eu/include/drv_types.h | 1 -
drivers/staging/r8188eu/include/rtw_mlme.h | 6 ++++++
drivers/staging/r8188eu/include/rtw_qos.h | 14 --------------
3 files changed, 6 insertions(+), 15 deletions(-)
delete mode 100644 drivers/staging/r8188eu/include/rtw_qos.h
diff --git a/drivers/staging/r8188eu/include/drv_types.h b/drivers/staging/r8188eu/include/drv_types.h
index eed807d5dbc2..0acc5847a602 100644
--- a/drivers/staging/r8188eu/include/drv_types.h
+++ b/drivers/staging/r8188eu/include/drv_types.h
@@ -22,7 +22,6 @@
#include <rtw_recv.h>
#include <hal_intf.h>
#include <hal_com.h>
-#include <rtw_qos.h>
#include <rtw_security.h>
#include <rtw_pwrctrl.h>
#include <rtw_io.h>
diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r8188eu/include/rtw_mlme.h
index 3ef1a008c602..d5b479ae7799 100644
--- a/drivers/staging/r8188eu/include/rtw_mlme.h
+++ b/drivers/staging/r8188eu/include/rtw_mlme.h
@@ -313,6 +313,12 @@ struct tdls_info {
u8 enable;
};
+struct qos_priv {
+ /* bit mask option: u-apsd,
+ * s-apsd, ts, block ack... */
+ unsigned int qos_option;
+};
+
struct mlme_priv {
spinlock_t lock;
int fw_state; /* shall we protect this variable? maybe not necessarily... */
diff --git a/drivers/staging/r8188eu/include/rtw_qos.h b/drivers/staging/r8188eu/include/rtw_qos.h
deleted file mode 100644
index 3150e00b8d3a..000000000000
--- a/drivers/staging/r8188eu/include/rtw_qos.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
-/* Copyright(c) 2007 - 2011 Realtek Corporation. */
-
-#ifndef _RTW_QOS_H_
-#define _RTW_QOS_H_
-
-#include <osdep_service.h>
-
-struct qos_priv {
- unsigned int qos_option; /* bit mask option: u-apsd,
- * s-apsd, ts, block ack... */
-};
-
-#endif /* _RTL871X_QOS_H_ */
--
2.32.0
next prev parent reply other threads:[~2021-07-29 17:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-29 17:09 [PATCH 0/6] Do more cleanup of the new rtl8188eu driver Larry Finger
2021-07-29 17:09 ` [PATCH 1/6] staging: r8188eu: Remove empty header file Larry Finger
2021-07-29 17:09 ` [PATCH 2/6] staging: r8188eu: Remove tests of kernel version Larry Finger
2021-07-29 17:09 ` Larry Finger [this message]
2021-07-29 17:09 ` [PATCH 4/6] staging: r8188eu: Remove header file include/usb_hal.h Larry Finger
2021-07-29 17:09 ` [PATCH 5/6] staging: r8188eu: Remove header file include/rtw_version.h Larry Finger
2021-07-30 8:23 ` Greg KH
2021-07-29 17:09 ` [PATCH 6/6] staging: r8188eu: Add "fallthrough" statement to quiet compiler Larry Finger
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=20210729170930.23171-4-Larry.Finger@lwfinger.net \
--to=larry.finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--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
all inboxes | Powered by JetHome®