From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 09/22] staging: rtl8192e: Remove read|write_nic_io_(d)word|byte()
Date: Sun, 12 Jul 2015 22:29:19 +0200 [thread overview]
Message-ID: <1436732972-30175-10-git-send-email-mateusz.kulikowski@gmail.com> (raw)
In-Reply-To: <1436732972-30175-1-git-send-email-mateusz.kulikowski@gmail.com>
None of this functions was used.
Also remove PlatformIOCheckPageLegalAndGetRegMask() used by them.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 158 ---------------------------
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 7 --
2 files changed, 165 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 32bf475..8134359 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -90,164 +90,6 @@ static struct pci_driver rtl8192_pci_driver = {
/****************************************************************************
-----------------------------IO STUFF-------------------------
*****************************************************************************/
-static bool PlatformIOCheckPageLegalAndGetRegMask(u32 u4bPage, u8 *pu1bPageMask)
-{
- bool bReturn = false;
-
- *pu1bPageMask = 0xfe;
-
- switch (u4bPage) {
- case 1: case 2: case 3: case 4:
- case 8: case 9: case 10: case 12: case 13:
- bReturn = true;
- *pu1bPageMask = 0xf0;
- break;
-
- default:
- bReturn = false;
- break;
- }
-
- return bReturn;
-}
-
-void write_nic_io_byte(struct net_device *dev, int x, u8 y)
-{
- u32 u4bPage = x >> 8;
- u8 u1PageMask = 0;
- bool bIsLegalPage = false;
-
- if (u4bPage == 0) {
- outb(y&0xff, dev->base_addr + x);
-
- } else {
- bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
- &u1PageMask);
- if (bIsLegalPage) {
- u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
- write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
- (u8)u4bPage));
- write_nic_io_byte(dev, (x & 0xff), y);
- write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
- }
- }
-}
-
-void write_nic_io_word(struct net_device *dev, int x, u16 y)
-{
- u32 u4bPage = x >> 8;
- u8 u1PageMask = 0;
- bool bIsLegalPage = false;
-
- if (u4bPage == 0) {
- outw(y, dev->base_addr + x);
- } else {
- bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
- &u1PageMask);
- if (bIsLegalPage) {
- u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
- write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
- (u8)u4bPage));
- write_nic_io_word(dev, (x & 0xff), y);
- write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
-
- }
- }
-}
-
-void write_nic_io_dword(struct net_device *dev, int x, u32 y)
-{
- u32 u4bPage = x >> 8;
- u8 u1PageMask = 0;
- bool bIsLegalPage = false;
-
- if (u4bPage == 0) {
- outl(y, dev->base_addr + x);
- } else {
- bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
- &u1PageMask);
- if (bIsLegalPage) {
- u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
- write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
- (u8)u4bPage));
- write_nic_io_dword(dev, (x & 0xff), y);
- write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
- }
- }
-}
-
-u8 read_nic_io_byte(struct net_device *dev, int x)
-{
- u32 u4bPage = x >> 8;
- u8 u1PageMask = 0;
- bool bIsLegalPage = false;
- u8 Data = 0;
-
- if (u4bPage == 0)
- return 0xff&inb(dev->base_addr + x);
-
- bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
- &u1PageMask);
- if (bIsLegalPage) {
- u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
- write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
- (u8)u4bPage));
- Data = read_nic_io_byte(dev, (x & 0xff));
- write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
- }
-
- return Data;
-}
-
-u16 read_nic_io_word(struct net_device *dev, int x)
-{
- u32 u4bPage = x >> 8;
- u8 u1PageMask = 0;
- bool bIsLegalPage = false;
- u16 Data = 0;
-
- if (u4bPage == 0)
- return inw(dev->base_addr + x);
- bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
- &u1PageMask);
- if (bIsLegalPage) {
- u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
- write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
- (u8)u4bPage));
- Data = read_nic_io_word(dev, (x & 0xff));
- write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
- }
-
- return Data;
-}
-
-u32 read_nic_io_dword(struct net_device *dev, int x)
-{
- u32 u4bPage = x >> 8;
- u8 u1PageMask = 0;
- bool bIsLegalPage = false;
- u32 Data = 0;
-
- if (u4bPage == 0)
- return inl(dev->base_addr + x);
- bIsLegalPage = PlatformIOCheckPageLegalAndGetRegMask(u4bPage,
- &u1PageMask);
- if (bIsLegalPage) {
- u8 u1bPsr = read_nic_io_byte(dev, PSR);
-
- write_nic_io_byte(dev, PSR, ((u1bPsr & u1PageMask) |
- (u8)u4bPage));
- Data = read_nic_io_dword(dev, (x & 0xff));
- write_nic_io_byte(dev, PSR, (u1bPsr & u1PageMask));
- }
-
- return Data;
-}
u8 read_nic_byte(struct net_device *dev, int x)
{
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 776d950..cb7af04 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -581,13 +581,6 @@ extern const struct ethtool_ops rtl819x_ethtool_ops;
void rtl8192_tx_cmd(struct net_device *dev, struct sk_buff *skb);
short rtl8192_tx(struct net_device *dev, struct sk_buff *skb);
-u8 read_nic_io_byte(struct net_device *dev, int x);
-u32 read_nic_io_dword(struct net_device *dev, int x);
-u16 read_nic_io_word(struct net_device *dev, int x);
-void write_nic_io_byte(struct net_device *dev, int x, u8 y);
-void write_nic_io_word(struct net_device *dev, int x, u16 y);
-void write_nic_io_dword(struct net_device *dev, int x, u32 y);
-
u8 read_nic_byte(struct net_device *dev, int x);
u32 read_nic_dword(struct net_device *dev, int x);
u16 read_nic_word(struct net_device *dev, int x);
--
1.8.4.1
next prev parent reply other threads:[~2015-07-12 20:29 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-12 20:29 [PATCH 00/22] staging: rtl8192e: Various cleanups Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 01/22] staging: rtl8192e: Remove ToLegalChannel() Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 02/22] staging: rtl8192e: Remove unused defines Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 03/22] staging: rtl8192e: Remove undefs Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 04/22] staging: rtl8192e: Remove unused enums Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 05/22] staging: rtl8192e: Remove unused fields from rtllib_stats Mateusz Kulikowski
2015-07-13 12:01 ` Dan Carpenter
2015-07-12 20:29 ` [PATCH 06/22] staging: rtl8192e: Remove unused ether_header structure Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 07/22] staging: rtl8192e: Remove unused rtllib_device::freq_band Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 08/22] staging: rtl8192e: Remove DOT11D_GetMaxTxPwrInDbm() Mateusz Kulikowski
2015-07-12 20:29 ` Mateusz Kulikowski [this message]
2015-07-12 20:29 ` [PATCH 10/22] staging: rtl8192e: Remove DMESG macro Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 11/22] staging: rtl8192e: Remove rtl819x_process_cck_rxpathsel() Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 12/22] staging: rtl8192e: probe: Remove bdma64 check Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 13/22] staging: rtl8192e: Remove rtl8192_rx_cmd() Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 14/22] staging: rtl8192e: rtl_dm: Make functions static Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 15/22] staging: rtl8192e: rtllib_HTProc: " Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 16/22] staging: rtl8192e: Make phy_RF8256_Config_ParaFile() static Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 17/22] staging: rtl8192e: rtl_core: Make functions static Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 18/22] staging: rtl8192e: r8192e_phy: " Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 19/22] staging: rtl8192e: Make rtl8192_QueryIsShort() static Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 20/22] staging: rtl8192e: rtllib_tx: Make functions static Mateusz Kulikowski
2015-07-12 20:29 ` [PATCH 21/22] staging: rtl8192e: Make rtllib_rx_mgt() static Mateusz Kulikowski
2015-07-13 7:19 ` Sudip Mukherjee
2015-07-12 20:29 ` [PATCH 22/22] staging: rtl8192e: rtllib_softmac: Make functions static Mateusz Kulikowski
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=1436732972-30175-10-git-send-email-mateusz.kulikowski@gmail.com \
--to=mateusz.kulikowski@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®