summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Safonov <insafonov@gmail.com>2016-09-03 22:33:34 +0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-12 11:30:03 +0200
commitf86fc9b0b67ea6af2e04fc2a4a43e0152a944902 (patch)
treea0d186e05ed56e18910d33c1f30d07232b26fc3b
parent1ac7c98699396cbe53fab75b353f223743b52e7d (diff)
downloadlinux-f86fc9b0b67ea6af2e04fc2a4a43e0152a944902.tar.bz2
staging: r8188eu: rename ReadChipVersion8188E to rtw_hal_read_chip_version
And remove two one-line wrappers. Signed-off-by: Ivan Safonov <insafonov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/rtl8188eu/hal/hal_intf.c6
-rw-r--r--drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c4
-rw-r--r--drivers/staging/rtl8188eu/include/hal_intf.h1
3 files changed, 1 insertions, 10 deletions
diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index daed450cf880..bc253f402d9a 100644
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -19,12 +19,6 @@
#include <hal_intf.h>
#include <usb_hal.h>
-void rtw_hal_read_chip_version(struct adapter *adapt)
-{
- if (adapt->HalFunc.read_chip_version)
- adapt->HalFunc.read_chip_version(adapt);
-}
-
void rtw_hal_free_data(struct adapter *adapt)
{
if (adapt->HalFunc.free_hal_data)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 75eda92306a5..8c9fdfbc66b5 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -123,7 +123,7 @@ static void rtl8188e_free_hal_data(struct adapter *padapter)
padapter->HalData = NULL;
}
-static void ReadChipVersion8188E(struct adapter *padapter)
+void rtw_hal_read_chip_version(struct adapter *padapter)
{
u32 value32;
struct HAL_VERSION ChipVersion;
@@ -190,8 +190,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
pHalFunc->free_hal_data = &rtl8188e_free_hal_data;
pHalFunc->dm_init = &rtl8188e_init_dm_priv;
-
- pHalFunc->read_chip_version = &ReadChipVersion8188E;
}
/* */
diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index d3243efd0a60..b0ade594975c 100644
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -143,7 +143,6 @@ struct hal_ops {
void (*free_hal_data)(struct adapter *padapter);
void (*dm_init)(struct adapter *padapter);
- void (*read_chip_version)(struct adapter *padapter);
s32 (*interrupt_handler)(struct adapter *padapter);