From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH 09/32] staging: r8188eu: remove ODM_delay_us()
Date: Wed, 29 Dec 2021 21:50:45 +0100 [thread overview]
Message-ID: <20211229205108.26373-10-straube.linux@gmail.com> (raw)
In-Reply-To: <20211229205108.26373-1-straube.linux@gmail.com>
ODM_delay_us() is just a wrapper around udelay().
Remove ODM_delay_us() and call udelay() directly.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
.../staging/r8188eu/hal/odm_RegConfig8188E.c | 24 +++++++++----------
drivers/staging/r8188eu/hal/odm_interface.c | 5 ----
.../staging/r8188eu/include/odm_interface.h | 2 --
3 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c b/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c
index 8a829190b752..20201353c14f 100644
--- a/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c
+++ b/drivers/staging/r8188eu/hal/odm_RegConfig8188E.c
@@ -14,15 +14,15 @@ void odm_ConfigRFReg_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr,
} else if (Addr == 0xfc) {
ODM_delay_ms(1);
} else if (Addr == 0xfb) {
- ODM_delay_us(50);
+ udelay(50);
} else if (Addr == 0xfa) {
- ODM_delay_us(5);
+ udelay(5);
} else if (Addr == 0xf9) {
- ODM_delay_us(1);
+ udelay(1);
} else {
rtl8188e_PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH, RegAddr, bRFRegOffsetMask, Data);
/* Add 1us delay between BB/RF register setting. */
- ODM_delay_us(1);
+ udelay(1);
}
}
@@ -43,7 +43,7 @@ void odm_ConfigBB_AGC_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Bitmask
{
rtl8188e_PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data);
/* Add 1us delay between BB/RF register setting. */
- ODM_delay_us(1);
+ udelay(1);
}
void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr,
@@ -56,11 +56,11 @@ void odm_ConfigBB_PHY_REG_PG_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr,
else if (Addr == 0xfc)
ODM_delay_ms(1);
else if (Addr == 0xfb)
- ODM_delay_us(50);
+ udelay(50);
else if (Addr == 0xfa)
- ODM_delay_us(5);
+ udelay(5);
else if (Addr == 0xf9)
- ODM_delay_us(1);
+ udelay(1);
else
storePwrIndexDiffRateOffset(pDM_Odm->Adapter, Addr, Bitmask, Data);
}
@@ -74,17 +74,17 @@ void odm_ConfigBB_PHY_8188E(struct odm_dm_struct *pDM_Odm, u32 Addr, u32 Bitmask
} else if (Addr == 0xfc) {
ODM_delay_ms(1);
} else if (Addr == 0xfb) {
- ODM_delay_us(50);
+ udelay(50);
} else if (Addr == 0xfa) {
- ODM_delay_us(5);
+ udelay(5);
} else if (Addr == 0xf9) {
- ODM_delay_us(1);
+ udelay(1);
} else {
if (Addr == 0xa24)
pDM_Odm->RFCalibrateInfo.RegA24 = Data;
rtl8188e_PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data);
/* Add 1us delay between BB/RF register setting. */
- ODM_delay_us(1);
+ udelay(1);
}
}
diff --git a/drivers/staging/r8188eu/hal/odm_interface.c b/drivers/staging/r8188eu/hal/odm_interface.c
index 249577a9f867..ce9832ab7b13 100644
--- a/drivers/staging/r8188eu/hal/odm_interface.c
+++ b/drivers/staging/r8188eu/hal/odm_interface.c
@@ -15,8 +15,3 @@ void ODM_delay_ms(u32 ms)
{
mdelay(ms);
}
-
-void ODM_delay_us(u32 us)
-{
- udelay(us);
-}
diff --git a/drivers/staging/r8188eu/include/odm_interface.h b/drivers/staging/r8188eu/include/odm_interface.h
index 183899e782b1..20c662628646 100644
--- a/drivers/staging/r8188eu/include/odm_interface.h
+++ b/drivers/staging/r8188eu/include/odm_interface.h
@@ -19,6 +19,4 @@ s32 ODM_CompareMemory(struct odm_dm_struct *pDM_Odm, void *pBuf1, void *pBuf2,
/* ODM Timer relative API. */
void ODM_delay_ms(u32 ms);
-void ODM_delay_us(u32 us);
-
#endif /* __ODM_INTERFACE_H__ */
--
2.34.1
next prev parent reply other threads:[~2021-12-29 20:51 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-29 20:50 [PATCH 00/32] staging: r8188eu: remove odm_interface and odm_precomp.h Michael Straube
2021-12-29 20:50 ` [PATCH 01/32] staging: r8188eu: remove ODM_SetMACReg() Michael Straube
2021-12-29 20:50 ` [PATCH 02/32] staging: r8188eu: remove ODM_GetMACReg() Michael Straube
2021-12-29 20:50 ` [PATCH 03/32] staging: r8188eu: remove ODM_GetRFReg() Michael Straube
2021-12-29 20:50 ` [PATCH 04/32] staging: r8188eu: remove ODM_SetRFReg() Michael Straube
2021-12-29 20:50 ` [PATCH 05/32] staging: r8188eu: remove ODM_GetBBReg() Michael Straube
2021-12-29 20:50 ` [PATCH 06/32] staging: r8188eu: remove ODM_SetBBReg() Michael Straube
2021-12-29 20:50 ` [PATCH 07/32] staging: r8188eu: clean up coding style issues Michael Straube
2021-12-29 20:50 ` [PATCH 08/32] staging: r8188eu: remove ODM_sleep_ms() Michael Straube
2021-12-29 20:50 ` Michael Straube [this message]
2021-12-29 20:50 ` [PATCH 10/32] staging: r8188eu: remove ODM_delay_ms() Michael Straube
2021-12-29 20:50 ` [PATCH 11/32] staging: r8188eu: remove ODM_CompareMemory() Michael Straube
2021-12-29 20:50 ` [PATCH 12/32] staging: r8188eu: remove odm_interface Michael Straube
2021-12-29 20:50 ` [PATCH 13/32] staging: r8188eu: make odm_ConfigRFReg_8188E() static Michael Straube
2021-12-29 20:50 ` [PATCH 14/32] staging: r8188eu: remove unused prototypes Michael Straube
2021-12-29 20:50 ` [PATCH 15/32] staging: r8188eu: make odm_DIGInit() static Michael Straube
2021-12-29 20:50 ` [PATCH 16/32] staging: r8188eu: make odm_DIG() static Michael Straube
2021-12-29 20:50 ` [PATCH 17/32] staging: r8188eu: make odm_CommonInfoSelfInit() static Michael Straube
2021-12-29 20:50 ` [PATCH 18/32] staging: r8188eu: make odm_CommonInfoSelfUpdate() static Michael Straube
2021-12-29 20:50 ` [PATCH 19/32] staging: r8188eu: make odm_RateAdaptiveMaskInit() static Michael Straube
2021-12-29 20:50 ` [PATCH 20/32] staging: r8188eu: make odm_RefreshRateAdaptiveMask() static Michael Straube
2022-01-06 12:26 ` Dan Carpenter
2022-01-07 8:48 ` Michael Straube
2021-12-29 20:50 ` [PATCH 21/32] staging: r8188eu: make odm_DynamicBBPowerSavingInit() static Michael Straube
2021-12-29 20:50 ` [PATCH 22/32] staging: r8188eu: make odm_FalseAlarmCounterStatistics() static Michael Straube
2021-12-29 20:50 ` [PATCH 23/32] staging: r8188eu: make odm_CCKPacketDetectionThresh() static Michael Straube
2021-12-29 20:51 ` [PATCH 24/32] staging: r8188eu: make odm_RSSIMonitorCheck() static Michael Straube
2021-12-29 20:51 ` [PATCH 25/32] staging: r8188eu: remove odm_TXPowerTrackingInit() Michael Straube
2021-12-29 20:51 ` [PATCH 26/32] staging: r8188eu: make odm_TXPowerTrackingThermalMeterInit() static Michael Straube
2021-12-29 20:51 ` [PATCH 27/32] staging: r8188eu: make odm_InitHybridAntDiv() static Michael Straube
2021-12-29 20:51 ` [PATCH 28/32] staging: r8188eu: make odm_HwAntDiv() static Michael Straube
2021-12-29 20:51 ` [PATCH 29/32] staging: r8188eu: make ODM_EdcaTurboInit() static Michael Straube
2021-12-29 20:51 ` [PATCH 30/32] staging: r8188eu: make odm_EdcaTurboCheck() static Michael Straube
2021-12-29 20:51 ` [PATCH 31/32] staging: r8188eu: remove unnecessary comments Michael Straube
2021-12-29 20:51 ` [PATCH 32/32] staging: r8188eu: remove header odm_precomp.h Michael Straube
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=20211229205108.26373-10-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=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;
as well as URLs for NNTP newsgroup(s).