* [PATCH 1/6] staging: rtl8188eu: do not line break function definition
@ 2018-07-14 12:52 Michael Straube
2018-07-14 12:52 ` [PATCH 2/6] staging: rtl8188eu: rename Efuse_PowerSwitch Michael Straube
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Michael Straube @ 2018-07-14 12:52 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Do not line break function definition of Efuse_PowerSwitch().
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_efuse.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index 3ac3dd796ec9..367cb2cf8ad1 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -29,10 +29,7 @@ enum{
* and disable LDO 2.5V.
*/
-void Efuse_PowerSwitch(
- struct adapter *pAdapter,
- u8 bWrite,
- u8 PwrState)
+void Efuse_PowerSwitch(struct adapter *pAdapter, u8 bWrite, u8 PwrState)
{
u8 tempval;
u16 tmpV16;
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/6] staging: rtl8188eu: rename Efuse_PowerSwitch
2018-07-14 12:52 [PATCH 1/6] staging: rtl8188eu: do not line break function definition Michael Straube
@ 2018-07-14 12:52 ` Michael Straube
2018-07-14 12:52 ` [PATCH 3/6] staging: rtl8188eu: rename function parameters Michael Straube
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Michael Straube @ 2018-07-14 12:52 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Rename function to avoid CamelCase.
Efuse_PowerSwitch -> efuse_power_switch
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 ++++----
drivers/staging/rtl8188eu/include/rtw_efuse.h | 2 +-
2 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 367cb2cf8ad1..fa145cd89613 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -22,14 +22,14 @@ enum{
};
/*
- * Function: Efuse_PowerSwitch
+ * Function: efuse_power_switch
*
* Overview: When we want to enable write operation, we should change to
* pwr on state. When we stop write, we should switch to 500k mode
* and disable LDO 2.5V.
*/
-void Efuse_PowerSwitch(struct adapter *pAdapter, u8 bWrite, u8 PwrState)
+void efuse_power_switch(struct adapter *pAdapter, u8 bWrite, u8 PwrState)
{
u8 tempval;
u16 tmpV16;
@@ -896,11 +896,11 @@ void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata)
*/
static void Efuse_ReadAllMap(struct adapter *pAdapter, u8 efuseType, u8 *Efuse)
{
- Efuse_PowerSwitch(pAdapter, false, true);
+ efuse_power_switch(pAdapter, false, true);
efuse_ReadEFuse(pAdapter, efuseType, 0, EFUSE_MAP_LEN_88E, Efuse);
- Efuse_PowerSwitch(pAdapter, false, false);
+ efuse_power_switch(pAdapter, false, false);
}
/*
diff --git a/drivers/staging/rtl8188eu/include/rtw_efuse.h b/drivers/staging/rtl8188eu/include/rtw_efuse.h
index adfbf3571c8b..e125bab0caf1 100644
--- a/drivers/staging/rtl8188eu/include/rtw_efuse.h
+++ b/drivers/staging/rtl8188eu/include/rtw_efuse.h
@@ -82,7 +82,7 @@ u8 efuse_OneByteWrite(struct adapter *adapter, u16 addr, u8 data);
void efuse_ReadEFuse(struct adapter *Adapter, u8 efuseType, u16 _offset,
u16 _size_byte, u8 *pbuf);
-void Efuse_PowerSwitch(struct adapter *adapt, u8 bWrite, u8 PwrState);
+void efuse_power_switch(struct adapter *adapt, u8 bWrite, u8 PwrState);
int Efuse_PgPacketRead(struct adapter *adapt, u8 offset, u8 *data);
bool Efuse_PgPacketWrite(struct adapter *adapter, u8 offset, u8 word, u8 *data);
void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata);
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/6] staging: rtl8188eu: rename function parameters
2018-07-14 12:52 [PATCH 1/6] staging: rtl8188eu: do not line break function definition Michael Straube
2018-07-14 12:52 ` [PATCH 2/6] staging: rtl8188eu: rename Efuse_PowerSwitch Michael Straube
@ 2018-07-14 12:52 ` Michael Straube
2018-07-14 12:52 ` [PATCH 4/6] staging: rtl8188eu: rename variable Michael Straube
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Michael Straube @ 2018-07-14 12:52 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Rename function parameters to avoid CamelCase.
bWrite -> write
PwrState -> pwrstate
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 ++++----
drivers/staging/rtl8188eu/include/rtw_efuse.h | 2 +-
2 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 fa145cd89613..004b786de37e 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -29,12 +29,12 @@ enum{
* and disable LDO 2.5V.
*/
-void efuse_power_switch(struct adapter *pAdapter, u8 bWrite, u8 PwrState)
+void efuse_power_switch(struct adapter *pAdapter, u8 write, u8 pwrstate)
{
u8 tempval;
u16 tmpV16;
- if (PwrState) {
+ if (pwrstate) {
usb_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_ON);
/* 1.2V Power: From VDDON with Power Cut(0x0000h[15]), default valid */
@@ -57,7 +57,7 @@ void efuse_power_switch(struct adapter *pAdapter, u8 bWrite, u8 PwrState)
usb_write16(pAdapter, REG_SYS_CLKR, tmpV16);
}
- if (bWrite) {
+ if (write) {
/* Enable LDO 2.5V before read/write action */
tempval = usb_read8(pAdapter, EFUSE_TEST+3);
tempval &= 0x0F;
@@ -67,7 +67,7 @@ void efuse_power_switch(struct adapter *pAdapter, u8 bWrite, u8 PwrState)
} else {
usb_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_OFF);
- if (bWrite) {
+ if (write) {
/* Disable LDO 2.5V after read/write action */
tempval = usb_read8(pAdapter, EFUSE_TEST+3);
usb_write8(pAdapter, EFUSE_TEST+3, (tempval & 0x7F));
diff --git a/drivers/staging/rtl8188eu/include/rtw_efuse.h b/drivers/staging/rtl8188eu/include/rtw_efuse.h
index e125bab0caf1..3ec53761e9fd 100644
--- a/drivers/staging/rtl8188eu/include/rtw_efuse.h
+++ b/drivers/staging/rtl8188eu/include/rtw_efuse.h
@@ -82,7 +82,7 @@ u8 efuse_OneByteWrite(struct adapter *adapter, u16 addr, u8 data);
void efuse_ReadEFuse(struct adapter *Adapter, u8 efuseType, u16 _offset,
u16 _size_byte, u8 *pbuf);
-void efuse_power_switch(struct adapter *adapt, u8 bWrite, u8 PwrState);
+void efuse_power_switch(struct adapter *adapt, u8 write, u8 pwrstate);
int Efuse_PgPacketRead(struct adapter *adapt, u8 offset, u8 *data);
bool Efuse_PgPacketWrite(struct adapter *adapter, u8 offset, u8 word, u8 *data);
void efuse_WordEnableDataRead(u8 word_en, u8 *sourdata, u8 *targetdata);
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/6] staging: rtl8188eu: rename variable
2018-07-14 12:52 [PATCH 1/6] staging: rtl8188eu: do not line break function definition Michael Straube
2018-07-14 12:52 ` [PATCH 2/6] staging: rtl8188eu: rename Efuse_PowerSwitch Michael Straube
2018-07-14 12:52 ` [PATCH 3/6] staging: rtl8188eu: rename function parameters Michael Straube
@ 2018-07-14 12:52 ` Michael Straube
2018-07-14 12:52 ` [PATCH 5/6] staging: rtl8188eu: add spaces around '+' Michael Straube
2018-07-14 12:52 ` [PATCH 6/6] staging: rtl8188eu: remove redundant header file Michael Straube
4 siblings, 0 replies; 6+ messages in thread
From: Michael Straube @ 2018-07-14 12:52 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Rename variable to avoid CamelCase.
tmpV16 -> tmpv16
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_efuse.c | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index 004b786de37e..93d20bc758e7 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -32,29 +32,29 @@ enum{
void efuse_power_switch(struct adapter *pAdapter, u8 write, u8 pwrstate)
{
u8 tempval;
- u16 tmpV16;
+ u16 tmpv16;
if (pwrstate) {
usb_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_ON);
/* 1.2V Power: From VDDON with Power Cut(0x0000h[15]), default valid */
- tmpV16 = usb_read16(pAdapter, REG_SYS_ISO_CTRL);
- if (!(tmpV16 & PWC_EV12V)) {
- tmpV16 |= PWC_EV12V;
- usb_write16(pAdapter, REG_SYS_ISO_CTRL, tmpV16);
+ tmpv16 = usb_read16(pAdapter, REG_SYS_ISO_CTRL);
+ if (!(tmpv16 & PWC_EV12V)) {
+ tmpv16 |= PWC_EV12V;
+ usb_write16(pAdapter, REG_SYS_ISO_CTRL, tmpv16);
}
/* Reset: 0x0000h[28], default valid */
- tmpV16 = usb_read16(pAdapter, REG_SYS_FUNC_EN);
- if (!(tmpV16 & FEN_ELDR)) {
- tmpV16 |= FEN_ELDR;
- usb_write16(pAdapter, REG_SYS_FUNC_EN, tmpV16);
+ tmpv16 = usb_read16(pAdapter, REG_SYS_FUNC_EN);
+ if (!(tmpv16 & FEN_ELDR)) {
+ tmpv16 |= FEN_ELDR;
+ usb_write16(pAdapter, REG_SYS_FUNC_EN, tmpv16);
}
/* Clock: Gated(0x0008h[5]) 8M(0x0008h[1]) clock from ANA, default valid */
- tmpV16 = usb_read16(pAdapter, REG_SYS_CLKR);
- if ((!(tmpV16 & LOADER_CLK_EN)) || (!(tmpV16 & ANA8M))) {
- tmpV16 |= (LOADER_CLK_EN | ANA8M);
- usb_write16(pAdapter, REG_SYS_CLKR, tmpV16);
+ tmpv16 = usb_read16(pAdapter, REG_SYS_CLKR);
+ if ((!(tmpv16 & LOADER_CLK_EN)) || (!(tmpv16 & ANA8M))) {
+ tmpv16 |= (LOADER_CLK_EN | ANA8M);
+ usb_write16(pAdapter, REG_SYS_CLKR, tmpv16);
}
if (write) {
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/6] staging: rtl8188eu: add spaces around '+'
2018-07-14 12:52 [PATCH 1/6] staging: rtl8188eu: do not line break function definition Michael Straube
` (2 preceding siblings ...)
2018-07-14 12:52 ` [PATCH 4/6] staging: rtl8188eu: rename variable Michael Straube
@ 2018-07-14 12:52 ` Michael Straube
2018-07-14 12:52 ` [PATCH 6/6] staging: rtl8188eu: remove redundant header file Michael Straube
4 siblings, 0 replies; 6+ messages in thread
From: Michael Straube @ 2018-07-14 12:52 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Add spaces around '+' to follow kernel coding style.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_efuse.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_efuse.c b/drivers/staging/rtl8188eu/core/rtw_efuse.c
index 93d20bc758e7..b19aa26d1705 100644
--- a/drivers/staging/rtl8188eu/core/rtw_efuse.c
+++ b/drivers/staging/rtl8188eu/core/rtw_efuse.c
@@ -59,18 +59,18 @@ void efuse_power_switch(struct adapter *pAdapter, u8 write, u8 pwrstate)
if (write) {
/* Enable LDO 2.5V before read/write action */
- tempval = usb_read8(pAdapter, EFUSE_TEST+3);
+ tempval = usb_read8(pAdapter, EFUSE_TEST + 3);
tempval &= 0x0F;
tempval |= (VOLTAGE_V25 << 4);
- usb_write8(pAdapter, EFUSE_TEST+3, (tempval | 0x80));
+ usb_write8(pAdapter, EFUSE_TEST + 3, (tempval | 0x80));
}
} else {
usb_write8(pAdapter, REG_EFUSE_ACCESS, EFUSE_ACCESS_OFF);
if (write) {
/* Disable LDO 2.5V after read/write action */
- tempval = usb_read8(pAdapter, EFUSE_TEST+3);
- usb_write8(pAdapter, EFUSE_TEST+3, (tempval & 0x7F));
+ tempval = usb_read8(pAdapter, EFUSE_TEST + 3);
+ usb_write8(pAdapter, EFUSE_TEST + 3, (tempval & 0x7F));
}
}
}
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 6/6] staging: rtl8188eu: remove redundant header file
2018-07-14 12:52 [PATCH 1/6] staging: rtl8188eu: do not line break function definition Michael Straube
` (3 preceding siblings ...)
2018-07-14 12:52 ` [PATCH 5/6] staging: rtl8188eu: add spaces around '+' Michael Straube
@ 2018-07-14 12:52 ` Michael Straube
4 siblings, 0 replies; 6+ messages in thread
From: Michael Straube @ 2018-07-14 12:52 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Both functions declared in rtl8188e_led.h are also declared in
rtw_led.h which is included from drv_types.h. Remove rtl8188e_led.h
and it's includes.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 1 -
drivers/staging/rtl8188eu/hal/usb_halinit.c | 1 -
.../staging/rtl8188eu/include/rtl8188e_led.h | 20 -------------------
3 files changed, 22 deletions(-)
delete mode 100644 drivers/staging/rtl8188eu/include/rtl8188e_led.h
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index ca0b0f1c2a7f..412b76271a3d 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -8,7 +8,6 @@
#include <osdep_service.h>
#include <drv_types.h>
#include <rtl8188e_hal.h>
-#include <rtl8188e_led.h>
#include <usb_ops_linux.h>
/* LED object. */
diff --git a/drivers/staging/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index 4b3ece90bb34..d551d0cca90b 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 <rtl8188e_led.h>
#include <rtw_iol.h>
#include <phy.h>
diff --git a/drivers/staging/rtl8188eu/include/rtl8188e_led.h b/drivers/staging/rtl8188eu/include/rtl8188e_led.h
deleted file mode 100644
index 74f2554e41d3..000000000000
--- a/drivers/staging/rtl8188eu/include/rtl8188e_led.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/******************************************************************************
- *
- * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
- *
- ******************************************************************************/
-#ifndef __RTL8188E_LED_H__
-#define __RTL8188E_LED_H__
-
-#include <osdep_service.h>
-#include <drv_types.h>
-
-
-/* */
-/* Interface to manipulate LED objects. */
-/* */
-void SwLedOn(struct adapter *padapter, struct LED_871x *pLed);
-void SwLedOff(struct adapter *padapter, struct LED_871x *pLed);
-
-#endif
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-07-14 12:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-14 12:52 [PATCH 1/6] staging: rtl8188eu: do not line break function definition Michael Straube
2018-07-14 12:52 ` [PATCH 2/6] staging: rtl8188eu: rename Efuse_PowerSwitch Michael Straube
2018-07-14 12:52 ` [PATCH 3/6] staging: rtl8188eu: rename function parameters Michael Straube
2018-07-14 12:52 ` [PATCH 4/6] staging: rtl8188eu: rename variable Michael Straube
2018-07-14 12:52 ` [PATCH 5/6] staging: rtl8188eu: add spaces around '+' Michael Straube
2018-07-14 12:52 ` [PATCH 6/6] staging: rtl8188eu: remove redundant header file Michael Straube
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.