From: Jakub Sitnicki <jsitnicki@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Larry Finger <Larry.Finger@lwfinger.net>
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Jakub Sitnicki <jsitnicki@gmail.com>
Subject: [PATCH 5/5] staging: rtl8188eu: fold rtl8188e_read_chip_version() into rtl8188e_SetHalODMVar()
Date: Fri, 10 Jul 2015 18:52:21 +0200 [thread overview]
Message-ID: <1436547141-8010-6-git-send-email-jsitnicki@gmail.com> (raw)
In-Reply-To: <1436547141-8010-1-git-send-email-jsitnicki@gmail.com>
Both rtl8188e_read_chip_version() and ReadChipVersion8188E() are used
only in one place. Make ReadChipVersion8188E() a void function and
eliminate its wrapper - rtl8188e_read_chip_version().
Signed-off-by: Jakub Sitnicki <jsitnicki@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 49b6b9c..b05da9d 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -128,7 +128,7 @@ static void rtl8188e_free_hal_data(struct adapter *padapter)
padapter->HalData = NULL;
}
-static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter)
+static void ReadChipVersion8188E(struct adapter *padapter)
{
u32 value32;
struct HAL_VERSION ChipVersion;
@@ -148,13 +148,6 @@ static struct HAL_VERSION ReadChipVersion8188E(struct adapter *padapter)
pHalData->NumTotalRFPath = 1;
MSG_88E("RF_Type is %x!!\n", pHalData->rf_type);
-
- return ChipVersion;
-}
-
-static void rtl8188e_read_chip_version(struct adapter *padapter)
-{
- ReadChipVersion8188E(padapter);
}
static void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable eVariable, void *pValue1, bool bSet)
@@ -203,7 +196,7 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->dm_init = &rtl8188e_init_dm_priv;
- pHalFunc->read_chip_version = &rtl8188e_read_chip_version;
+ pHalFunc->read_chip_version = &ReadChipVersion8188E;
pHalFunc->set_bwmode_handler = &phy_set_bw_mode;
pHalFunc->set_channel_handler = &phy_sw_chnl;
--
2.1.0
prev parent reply other threads:[~2015-07-10 16:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 16:52 [PATCH 0/5] staging: rtl8188eu: Clean up rtl8188e_read_chip_version() Jakub Sitnicki
2015-07-10 16:52 ` [PATCH 1/5] staging: rtl8188eu: remove RegulatorMode from struct hal_data_8188e Jakub Sitnicki
2015-07-10 16:52 ` [PATCH 2/5] staging: rtl8188eu: remove ICtype from struct HAL_VERSION Jakub Sitnicki
2015-07-10 16:52 ` [PATCH 3/5] staging: rtl8188eu: remove RFtype " Jakub Sitnicki
2015-07-10 16:52 ` [PATCH 4/5] staging: rtl8188eu: remove ROMVer " Jakub Sitnicki
2015-07-10 16:52 ` Jakub Sitnicki [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=1436547141-8010-6-git-send-email-jsitnicki@gmail.com \
--to=jsitnicki@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sudipm.mukherjee@gmail.com \
/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
Powered by JetHome