* [PATCH 1/4] staging: rtl8188eu: rename rtw_IOL_applied
@ 2018-08-04 14:35 Michael Straube
2018-08-04 14:35 ` [PATCH 2/4] staging: rtl8188eu: remove unnecessary parentheses Michael Straube
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Michael Straube @ 2018-08-04 14:35 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Rename rtw_IOL_applied to be all lowercase.
rtw_IOL_applied -> rtw_iol_applied
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_iol.c | 2 +-
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 4 ++--
drivers/staging/rtl8188eu/include/rtw_iol.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index b19aa26d1705..0fd306a808c4 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -298,7 +298,7 @@ static s32 iol_read_efuse(struct adapter *padapter, u8 txpktbuf_bndy, u16 offset
void efuse_ReadEFuse(struct adapter *Adapter, u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf)
{
- if (rtw_IOL_applied(Adapter)) {
+ if (rtw_iol_applied(Adapter)) {
rtw_hal_power_on(Adapter);
iol_mode_enable(Adapter, 1);
iol_read_efuse(Adapter, 0, _offset, _size_byte, pbuf);
diff --git a/drivers/staging/rtl8188eu/core/rtw_iol.c b/drivers/staging/rtl8188eu/core/rtw_iol.c
index 6b97e9f2a77b..f7a86eac738e 100644
--- a/drivers/staging/rtl8188eu/core/rtw_iol.c
+++ b/drivers/staging/rtl8188eu/core/rtw_iol.c
@@ -7,7 +7,7 @@
#include <rtw_iol.h>
-bool rtw_IOL_applied(struct adapter *adapter)
+bool rtw_iol_applied(struct adapter *adapter)
{
if (adapter->registrypriv.fw_iol == 1)
return true;
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index 8e7190b98692..607170775fa5 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -75,7 +75,7 @@ s32 rtl8188e_iol_efuse_patch(struct adapter *padapter)
s32 result = _SUCCESS;
DBG_88E("==> %s\n", __func__);
- if (rtw_IOL_applied(padapter)) {
+ if (rtw_iol_applied(padapter)) {
iol_mode_enable(padapter, 1);
result = iol_execute(padapter, CMD_READ_EFUSE_MAP);
if (result == _SUCCESS)
@@ -207,7 +207,7 @@ s32 InitLLTTable(struct adapter *padapter, u8 txpktbuf_bndy)
u32 i;
u32 Last_Entry_Of_TxPktBuf = LAST_ENTRY_OF_TX_PKT_BUFFER;/* 176, 22k */
- if (rtw_IOL_applied(padapter)) {
+ if (rtw_iol_applied(padapter)) {
status = iol_InitLLTTable(padapter, txpktbuf_bndy);
} else {
for (i = 0; i < (txpktbuf_bndy - 1); i++) {
diff --git a/drivers/staging/rtl8188eu/include/rtw_iol.h b/drivers/staging/rtl8188eu/include/rtw_iol.h
index 53f5fe210e7b..f20b35e8d0a2 100644
--- a/drivers/staging/rtl8188eu/include/rtw_iol.h
+++ b/drivers/staging/rtl8188eu/include/rtw_iol.h
@@ -10,6 +10,6 @@
#include <osdep_service.h>
#include <drv_types.h>
-bool rtw_IOL_applied(struct adapter *adapter);
+bool rtw_iol_applied(struct adapter *adapter);
#endif /* __RTW_IOL_H_ */
--
2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/4] staging: rtl8188eu: remove unnecessary parentheses
2018-08-04 14:35 [PATCH 1/4] staging: rtl8188eu: rename rtw_IOL_applied Michael Straube
@ 2018-08-04 14:35 ` Michael Straube
2018-08-04 14:35 ` [PATCH 3/4] staging: rtl8188eu: remove redundant include Michael Straube
2018-08-04 14:35 ` [PATCH 4/4] staging: rtl8188eu: remove unnecessary includes Michael Straube
2 siblings, 0 replies; 4+ messages in thread
From: Michael Straube @ 2018-08-04 14:35 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Remove unnecessary parentheses from if conditions.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_iol.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_iol.c b/drivers/staging/rtl8188eu/core/rtw_iol.c
index f7a86eac738e..fc3c66201e59 100644
--- a/drivers/staging/rtl8188eu/core/rtw_iol.c
+++ b/drivers/staging/rtl8188eu/core/rtw_iol.c
@@ -12,8 +12,8 @@ bool rtw_iol_applied(struct adapter *adapter)
if (adapter->registrypriv.fw_iol == 1)
return true;
- if ((adapter->registrypriv.fw_iol == 2) &&
- (!adapter_to_dvobj(adapter)->ishighspeed))
+ if (adapter->registrypriv.fw_iol == 2 &&
+ !adapter_to_dvobj(adapter)->ishighspeed)
return true;
return false;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/4] staging: rtl8188eu: remove redundant include
2018-08-04 14:35 [PATCH 1/4] staging: rtl8188eu: rename rtw_IOL_applied Michael Straube
2018-08-04 14:35 ` [PATCH 2/4] staging: rtl8188eu: remove unnecessary parentheses Michael Straube
@ 2018-08-04 14:35 ` Michael Straube
2018-08-04 14:35 ` [PATCH 4/4] staging: rtl8188eu: remove unnecessary includes Michael Straube
2 siblings, 0 replies; 4+ messages in thread
From: Michael Straube @ 2018-08-04 14:35 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
The header osdep_service.h is included from drv_types.h,
so remove the redundant include.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/include/rtw_iol.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/rtl8188eu/include/rtw_iol.h b/drivers/staging/rtl8188eu/include/rtw_iol.h
index f20b35e8d0a2..d713782d5cdc 100644
--- a/drivers/staging/rtl8188eu/include/rtw_iol.h
+++ b/drivers/staging/rtl8188eu/include/rtw_iol.h
@@ -7,7 +7,6 @@
#ifndef __RTW_IOL_H_
#define __RTW_IOL_H_
-#include <osdep_service.h>
#include <drv_types.h>
bool rtw_iol_applied(struct adapter *adapter);
--
2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4/4] staging: rtl8188eu: remove unnecessary includes
2018-08-04 14:35 [PATCH 1/4] staging: rtl8188eu: rename rtw_IOL_applied Michael Straube
2018-08-04 14:35 ` [PATCH 2/4] staging: rtl8188eu: remove unnecessary parentheses Michael Straube
2018-08-04 14:35 ` [PATCH 3/4] staging: rtl8188eu: remove redundant include Michael Straube
@ 2018-08-04 14:35 ` Michael Straube
2 siblings, 0 replies; 4+ messages in thread
From: Michael Straube @ 2018-08-04 14:35 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
In the header rtw_iol.h there is only one function declared.
Remove the include of rtw_iol.h from files that do not use
this function.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/hal/mac_cfg.c | 1 -
drivers/staging/rtl8188eu/hal/phy.c | 1 -
drivers/staging/rtl8188eu/hal/usb_halinit.c | 1 -
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 1 -
4 files changed, 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/mac_cfg.c b/drivers/staging/rtl8188eu/hal/mac_cfg.c
index 8e849228f376..370aa5cc55a7 100644
--- a/drivers/staging/rtl8188eu/hal/mac_cfg.c
+++ b/drivers/staging/rtl8188eu/hal/mac_cfg.c
@@ -7,7 +7,6 @@
#include "odm_precomp.h"
#include "phy.h"
-#include <rtw_iol.h>
/* MAC_REG.TXT */
diff --git a/drivers/staging/rtl8188eu/hal/phy.c b/drivers/staging/rtl8188eu/hal/phy.c
index 0fe2d53310f0..3c7cf8720df8 100644
--- a/drivers/staging/rtl8188eu/hal/phy.c
+++ b/drivers/staging/rtl8188eu/hal/phy.c
@@ -8,7 +8,6 @@
#include <osdep_service.h>
#include <drv_types.h>
-#include <rtw_iol.h>
#include <rtl8188e_hal.h>
#include <rf.h>
#include <phy.h>
diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 56fda8005d38..12864b648fa8 100644
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -11,7 +11,6 @@
#include <rtw_efuse.h>
#include <fw.h>
#include <rtl8188e_hal.h>
-#include <rtw_iol.h>
#include <phy.h>
#define HAL_BB_ENABLE 1
diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index 19387d87185d..bee3c3a7a7a9 100644
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -19,7 +19,6 @@
#include <rtw_ioctl_set.h>
#include <rtl8188e_hal.h>
-#include <rtw_iol.h>
#include <linux/vmalloc.h>
#include <linux/etherdevice.h>
--
2.18.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-08-04 14:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-04 14:35 [PATCH 1/4] staging: rtl8188eu: rename rtw_IOL_applied Michael Straube
2018-08-04 14:35 ` [PATCH 2/4] staging: rtl8188eu: remove unnecessary parentheses Michael Straube
2018-08-04 14:35 ` [PATCH 3/4] staging: rtl8188eu: remove redundant include Michael Straube
2018-08-04 14:35 ` [PATCH 4/4] staging: rtl8188eu: remove unnecessary includes Michael Straube
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).