All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bryan Brattlof <hello@bryanbrattlof.com>
To: Hans de Goede <hdegoede@redhat.com>,
	Larry Finger <Larry.Finger@lwfinger.net>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Bryan Brattlof <hello@bryanbrattlof.com>,
	linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 1/8] staging: rtl8723bs: remove duplicate names for _rtw_read8()
Date: Tue, 18 May 2021 18:27:43 +0000	[thread overview]
Message-ID: <9880c86c2aad7d95a714d8b03b28b83634f98c1e.1621361919.git-series.hello@bryanbrattlof.com> (raw)
In-Reply-To: <cover.7975aa58aadc20eae4102c8c0fe0e0d0ecb0a9fa.1621361919.git-series.hello@bryanbrattlof.com>

_rtw_read8() is redefined as rtw_read8() and PlatformEFIORead1Byte().
Because rtw_read8() is the only name used in the driver, remove the
duplicate definitions and rename the function from _rtw_read8() to
rtw_read8()

Signed-off-by: Bryan Brattlof <hello@bryanbrattlof.com>
---
 drivers/staging/rtl8723bs/core/rtw_io.c    | 2 +-
 drivers/staging/rtl8723bs/include/rtw_io.h | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/rtl8723bs/core/rtw_io.c b/drivers/staging/rtl8723bs/core/rtw_io.c
index ecbb679fbc16..99bb53aee59c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_io.c
+++ b/drivers/staging/rtl8723bs/core/rtw_io.c
@@ -33,7 +33,7 @@ jackson@realtek.com.tw
 #define rtw_cpu_to_le16(val)		val
 #define rtw_cpu_to_le32(val)		val

-u8 _rtw_read8(struct adapter *adapter, u32 addr)
+u8 rtw_read8(struct adapter *adapter, u32 addr)
 {
 	/* struct	io_queue	*pio_queue = (struct io_queue *)adapter->pio_queue; */
 	struct io_priv *pio_priv = &adapter->iopriv;
diff --git a/drivers/staging/rtl8723bs/include/rtw_io.h b/drivers/staging/rtl8723bs/include/rtw_io.h
index fbb73e698e09..f7b441e1eae1 100644
--- a/drivers/staging/rtl8723bs/include/rtw_io.h
+++ b/drivers/staging/rtl8723bs/include/rtw_io.h
@@ -170,7 +170,7 @@ extern void unregister_intf_hdl(struct intf_hdl *pintfhdl);
 extern void _rtw_attrib_read(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);
 extern void _rtw_attrib_write(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

-extern u8 _rtw_read8(struct adapter *adapter, u32 addr);
+extern u8 rtw_read8(struct adapter *adapter, u32 addr);
 extern u16 _rtw_read16(struct adapter *adapter, u32 addr);
 extern u32 _rtw_read32(struct adapter *adapter, u32 addr);

@@ -182,7 +182,6 @@ extern u8 _rtw_sd_f0_read8(struct adapter *adapter, u32 addr);

 extern u32 _rtw_write_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem);

-#define rtw_read8(adapter, addr) _rtw_read8((adapter), (addr))
 #define rtw_read16(adapter, addr) _rtw_read16((adapter), (addr))
 #define rtw_read32(adapter, addr) _rtw_read32((adapter), (addr))

@@ -243,8 +242,6 @@ extern void dev_power_down(struct adapter *Adapter, u8 bpwrup);
 #define PlatformEFIOWrite4Byte(_a, _b, _c)		\
 	rtw_write32(_a, _b, _c)

-#define PlatformEFIORead1Byte(_a, _b)		\
-		rtw_read8(_a, _b)
 #define PlatformEFIORead2Byte(_a, _b)		\
 		rtw_read16(_a, _b)
 #define PlatformEFIORead4Byte(_a, _b)		\
--
git-series 0.9.1


       reply	other threads:[~2021-05-18 18:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <cover.7975aa58aadc20eae4102c8c0fe0e0d0ecb0a9fa.1621361919.git-series.hello@bryanbrattlof.com>
2021-05-18 18:27 ` Bryan Brattlof [this message]
2021-05-18 18:27 ` [PATCH 4/8] staging: rtl8723bs: remove duplicate names for _rtw_write8() Bryan Brattlof
2021-05-18 18:28 ` [PATCH 3/8] staging: rtl8723bs: remove duplicate names for _rtw_read32() Bryan Brattlof
2021-05-18 18:28 ` [PATCH 5/8] staging: rtl8723bs: remove duplicate names for _rtw_write16() Bryan Brattlof
2021-05-18 18:28 ` [PATCH 2/8] staging: rtl8723bs: remove duplicate names for _rtw_read16() Bryan Brattlof
2021-05-18 18:29 ` [PATCH 7/8] staging: rtl8723bs: remove duplicate name for _rtw_write_port() Bryan Brattlof
2021-05-18 18:30 ` [PATCH 8/8] staging: rtl8723bs: remove _rtw_sd_f0_read8() Bryan Brattlof
2021-05-18 18:31 ` [PATCH 6/8] staging: rtl8723bs: remove duplicate names for _rtw_write32() Bryan Brattlof

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=9880c86c2aad7d95a714d8b03b28b83634f98c1e.1621361919.git-series.hello@bryanbrattlof.com \
    --to=hello@bryanbrattlof.com \
    --cc=Larry.Finger@lwfinger.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=hdegoede@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-staging@lists.linux.dev \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.