* [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c
@ 2018-11-21 19:49 Michael Straube
2018-11-21 19:49 ` [PATCH 02/10] staging: rtl8188eu: cleanup comments " Michael Straube
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Michael Straube @ 2018-11-21 19:49 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Remove unnecessary parentheses reported by checkpatch.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index 412b76271a3d..411649a0b070 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -54,16 +54,16 @@ void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)
/* Initialize all LED_871x objects. */
void rtw_hal_sw_led_init(struct adapter *padapter)
{
- struct led_priv *pledpriv = &(padapter->ledpriv);
+ struct led_priv *pledpriv = &padapter->ledpriv;
- InitLed871x(padapter, &(pledpriv->SwLed0));
+ InitLed871x(padapter, &pledpriv->SwLed0);
}
/* Description: */
/* DeInitialize all LED_819xUsb objects. */
void rtw_hal_sw_led_deinit(struct adapter *padapter)
{
- struct led_priv *ledpriv = &(padapter->ledpriv);
+ struct led_priv *ledpriv = &padapter->ledpriv;
- DeInitLed871x(&(ledpriv->SwLed0));
+ DeInitLed871x(&ledpriv->SwLed0);
}
--
2.19.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 02/10] staging: rtl8188eu: cleanup comments in rtl8188eu_led.c
2018-11-21 19:49 [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c Michael Straube
@ 2018-11-21 19:49 ` Michael Straube
2018-11-21 19:49 ` [PATCH 03/10] staging: rtl8188eu: add spaces around '&' " Michael Straube
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Michael Straube @ 2018-11-21 19:49 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Remove comments in rtl8188eu_led.c. The function names are well
descriptive.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index 411649a0b070..535ada474164 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -10,11 +10,6 @@
#include <rtl8188e_hal.h>
#include <usb_ops_linux.h>
-/* LED object. */
-
-/* LED_819xUsb routines. */
-/* Description: */
-/* Turn on LED according to LedPin specified. */
void SwLedOn(struct adapter *padapter, struct LED_871x *pLed)
{
u8 LedCfg;
@@ -22,12 +17,10 @@ void SwLedOn(struct adapter *padapter, struct LED_871x *pLed)
if (padapter->bSurpriseRemoved || padapter->bDriverStopped)
return;
LedCfg = usb_read8(padapter, REG_LEDCFG2);
- usb_write8(padapter, REG_LEDCFG2, (LedCfg&0xf0) | BIT(5) | BIT(6)); /* SW control led0 on. */
+ usb_write8(padapter, REG_LEDCFG2, (LedCfg&0xf0) | BIT(5) | BIT(6));
pLed->bLedOn = true;
}
-/* Description: */
-/* Turn off LED according to LedPin specified. */
void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)
{
u8 LedCfg;
@@ -47,11 +40,6 @@ void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)
pLed->bLedOn = false;
}
-/* Interface to manipulate LED objects. */
-/* Default LED behavior. */
-
-/* Description: */
-/* Initialize all LED_871x objects. */
void rtw_hal_sw_led_init(struct adapter *padapter)
{
struct led_priv *pledpriv = &padapter->ledpriv;
@@ -59,8 +47,6 @@ void rtw_hal_sw_led_init(struct adapter *padapter)
InitLed871x(padapter, &pledpriv->SwLed0);
}
-/* Description: */
-/* DeInitialize all LED_819xUsb objects. */
void rtw_hal_sw_led_deinit(struct adapter *padapter)
{
struct led_priv *ledpriv = &padapter->ledpriv;
--
2.19.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 03/10] staging: rtl8188eu: add spaces around '&' in rtl8188eu_led.c
2018-11-21 19:49 [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c Michael Straube
2018-11-21 19:49 ` [PATCH 02/10] staging: rtl8188eu: cleanup comments " Michael Straube
@ 2018-11-21 19:49 ` Michael Straube
2018-11-21 19:49 ` [PATCH 04/10] staging: rtl8188eu: rename LedCfg to avoid CamelCase Michael Straube
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Michael Straube @ 2018-11-21 19:49 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Add spaces around '&' to follow kernel coding style.
Reported by checkpatch.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index 535ada474164..d4495839af34 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -17,7 +17,7 @@ void SwLedOn(struct adapter *padapter, struct LED_871x *pLed)
if (padapter->bSurpriseRemoved || padapter->bDriverStopped)
return;
LedCfg = usb_read8(padapter, REG_LEDCFG2);
- usb_write8(padapter, REG_LEDCFG2, (LedCfg&0xf0) | BIT(5) | BIT(6));
+ usb_write8(padapter, REG_LEDCFG2, (LedCfg & 0xf0) | BIT(5) | BIT(6));
pLed->bLedOn = true;
}
--
2.19.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 04/10] staging: rtl8188eu: rename LedCfg to avoid CamelCase
2018-11-21 19:49 [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c Michael Straube
2018-11-21 19:49 ` [PATCH 02/10] staging: rtl8188eu: cleanup comments " Michael Straube
2018-11-21 19:49 ` [PATCH 03/10] staging: rtl8188eu: add spaces around '&' " Michael Straube
@ 2018-11-21 19:49 ` Michael Straube
2018-11-21 19:49 ` [PATCH 05/10] staging: rtl8188eu: rename SwLedOn " Michael Straube
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Michael Straube @ 2018-11-21 19:49 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Rename the variable LedCfg to avoid CamleCase.
LedCfg -> led_cfg
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index d4495839af34..7e3f04bfd3f0 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -12,30 +12,30 @@
void SwLedOn(struct adapter *padapter, struct LED_871x *pLed)
{
- u8 LedCfg;
+ u8 led_cfg;
if (padapter->bSurpriseRemoved || padapter->bDriverStopped)
return;
- LedCfg = usb_read8(padapter, REG_LEDCFG2);
- usb_write8(padapter, REG_LEDCFG2, (LedCfg & 0xf0) | BIT(5) | BIT(6));
+ led_cfg = usb_read8(padapter, REG_LEDCFG2);
+ usb_write8(padapter, REG_LEDCFG2, (led_cfg & 0xf0) | BIT(5) | BIT(6));
pLed->bLedOn = true;
}
void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)
{
- u8 LedCfg;
+ u8 led_cfg;
if (padapter->bSurpriseRemoved || padapter->bDriverStopped)
goto exit;
- LedCfg = usb_read8(padapter, REG_LEDCFG2);/* 0x4E */
+ led_cfg = usb_read8(padapter, REG_LEDCFG2);/* 0x4E */
/* Open-drain arrangement for controlling the LED) */
- LedCfg &= 0x90; /* Set to software control. */
- usb_write8(padapter, REG_LEDCFG2, (LedCfg | BIT(3)));
- LedCfg = usb_read8(padapter, REG_MAC_PINMUX_CFG);
- LedCfg &= 0xFE;
- usb_write8(padapter, REG_MAC_PINMUX_CFG, LedCfg);
+ led_cfg &= 0x90; /* Set to software control. */
+ usb_write8(padapter, REG_LEDCFG2, (led_cfg | BIT(3)));
+ led_cfg = usb_read8(padapter, REG_MAC_PINMUX_CFG);
+ led_cfg &= 0xFE;
+ usb_write8(padapter, REG_MAC_PINMUX_CFG, led_cfg);
exit:
pLed->bLedOn = false;
}
--
2.19.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 05/10] staging: rtl8188eu: rename SwLedOn to avoid CamelCase
2018-11-21 19:49 [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c Michael Straube
` (2 preceding siblings ...)
2018-11-21 19:49 ` [PATCH 04/10] staging: rtl8188eu: rename LedCfg to avoid CamelCase Michael Straube
@ 2018-11-21 19:49 ` Michael Straube
2018-11-21 19:49 ` [PATCH 06/10] staging: rtl8188eu: rename SwLedOff " Michael Straube
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Michael Straube @ 2018-11-21 19:49 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Rename the function SwLedOn to avoid CamelCase.
SwLedOn -> sw_led_on
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_led.c | 2 +-
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 2 +-
drivers/staging/rtl8188eu/include/rtw_led.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index a2e7789aecbd..c3cd3abf9cc7 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -94,7 +94,7 @@ static void SwLedBlink1(struct LED_871x *pLed)
/* Change LED according to BlinkingLedState specified. */
if (pLed->BlinkingLedState == RTW_LED_ON) {
- SwLedOn(padapter, pLed);
+ sw_led_on(padapter, pLed);
RT_TRACE(_module_rtl8712_led_c_, _drv_info_,
("Blinktimes (%d): turn on\n", pLed->BlinkTimes));
} else {
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index 7e3f04bfd3f0..98f3ebf44944 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -10,7 +10,7 @@
#include <rtl8188e_hal.h>
#include <usb_ops_linux.h>
-void SwLedOn(struct adapter *padapter, struct LED_871x *pLed)
+void sw_led_on(struct adapter *padapter, struct LED_871x *pLed)
{
u8 led_cfg;
diff --git a/drivers/staging/rtl8188eu/include/rtw_led.h b/drivers/staging/rtl8188eu/include/rtw_led.h
index e50237ab05c4..a3921596a577 100644
--- a/drivers/staging/rtl8188eu/include/rtw_led.h
+++ b/drivers/staging/rtl8188eu/include/rtw_led.h
@@ -94,7 +94,7 @@ void DeInitLed871x(struct LED_871x *pLed);
/* hal... */
void BlinkHandler(struct LED_871x *pLed);
-void SwLedOn(struct adapter *padapter, struct LED_871x *pLed);
+void sw_led_on(struct adapter *padapter, struct LED_871x *pLed);
void SwLedOff(struct adapter *padapter, struct LED_871x *pLed);
#endif /* __RTW_LED_H_ */
--
2.19.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 06/10] staging: rtl8188eu: rename SwLedOff to avoid CamelCase
2018-11-21 19:49 [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c Michael Straube
` (3 preceding siblings ...)
2018-11-21 19:49 ` [PATCH 05/10] staging: rtl8188eu: rename SwLedOn " Michael Straube
@ 2018-11-21 19:49 ` Michael Straube
2018-11-21 19:49 ` [PATCH 07/10] staging: rtl8188eu: rename BlinkHandler " Michael Straube
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Michael Straube @ 2018-11-21 19:49 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Rename the function SwLedOff to avoid CamelCase.
SwLedOff -> sw_led_off
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_led.c | 6 +++---
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 2 +-
drivers/staging/rtl8188eu/include/rtw_led.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index c3cd3abf9cc7..851c12f032e8 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -98,13 +98,13 @@ static void SwLedBlink1(struct LED_871x *pLed)
RT_TRACE(_module_rtl8712_led_c_, _drv_info_,
("Blinktimes (%d): turn on\n", pLed->BlinkTimes));
} else {
- SwLedOff(padapter, pLed);
+ sw_led_off(padapter, pLed);
RT_TRACE(_module_rtl8712_led_c_, _drv_info_,
("Blinktimes (%d): turn off\n", pLed->BlinkTimes));
}
if (padapter->pwrctrlpriv.rf_pwrstate != rf_on) {
- SwLedOff(padapter, pLed);
+ sw_led_off(padapter, pLed);
ResetLedStatus(pLed);
return;
}
@@ -445,7 +445,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
del_timer_sync(&pLed->BlinkTimer);
pLed->bLedScanBlinkInProgress = false;
}
- SwLedOff(padapter, pLed);
+ sw_led_off(padapter, pLed);
break;
default:
break;
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index 98f3ebf44944..1d8832550dfd 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -21,7 +21,7 @@ void sw_led_on(struct adapter *padapter, struct LED_871x *pLed)
pLed->bLedOn = true;
}
-void SwLedOff(struct adapter *padapter, struct LED_871x *pLed)
+void sw_led_off(struct adapter *padapter, struct LED_871x *pLed)
{
u8 led_cfg;
diff --git a/drivers/staging/rtl8188eu/include/rtw_led.h b/drivers/staging/rtl8188eu/include/rtw_led.h
index a3921596a577..65cd9ce567b5 100644
--- a/drivers/staging/rtl8188eu/include/rtw_led.h
+++ b/drivers/staging/rtl8188eu/include/rtw_led.h
@@ -95,6 +95,6 @@ void DeInitLed871x(struct LED_871x *pLed);
/* hal... */
void BlinkHandler(struct LED_871x *pLed);
void sw_led_on(struct adapter *padapter, struct LED_871x *pLed);
-void SwLedOff(struct adapter *padapter, struct LED_871x *pLed);
+void sw_led_off(struct adapter *padapter, struct LED_871x *pLed);
#endif /* __RTW_LED_H_ */
--
2.19.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 07/10] staging: rtl8188eu: rename BlinkHandler to avoid CamelCase
2018-11-21 19:49 [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c Michael Straube
` (4 preceding siblings ...)
2018-11-21 19:49 ` [PATCH 06/10] staging: rtl8188eu: rename SwLedOff " Michael Straube
@ 2018-11-21 19:49 ` Michael Straube
2018-11-21 19:49 ` [PATCH 08/10] staging: rtl8188eu: cleanup a function comment Michael Straube
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Michael Straube @ 2018-11-21 19:49 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Rename the function BlinkHandler to avoid CamelCase.
BlinkHandler -> blink_handler
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_led.c | 4 ++--
drivers/staging/rtl8188eu/include/rtw_led.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index 851c12f032e8..481e2f1930c1 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -33,7 +33,7 @@ void BlinkWorkItemCallback(struct work_struct *work)
struct LED_871x *pLed = container_of(work, struct LED_871x,
BlinkWorkItem);
- BlinkHandler(pLed);
+ blink_handler(pLed);
}
/* */
@@ -459,7 +459,7 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
/* Description: */
/* Handler function of LED Blinking. */
/* */
-void BlinkHandler(struct LED_871x *pLed)
+void blink_handler(struct LED_871x *pLed)
{
struct adapter *padapter = pLed->padapter;
diff --git a/drivers/staging/rtl8188eu/include/rtw_led.h b/drivers/staging/rtl8188eu/include/rtw_led.h
index 65cd9ce567b5..80f8dcce05dc 100644
--- a/drivers/staging/rtl8188eu/include/rtw_led.h
+++ b/drivers/staging/rtl8188eu/include/rtw_led.h
@@ -93,7 +93,7 @@ void InitLed871x(struct adapter *padapter, struct LED_871x *pLed);
void DeInitLed871x(struct LED_871x *pLed);
/* hal... */
-void BlinkHandler(struct LED_871x *pLed);
+void blink_handler(struct LED_871x *pLed);
void sw_led_on(struct adapter *padapter, struct LED_871x *pLed);
void sw_led_off(struct adapter *padapter, struct LED_871x *pLed);
--
2.19.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 08/10] staging: rtl8188eu: cleanup a function comment
2018-11-21 19:49 [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c Michael Straube
` (5 preceding siblings ...)
2018-11-21 19:49 ` [PATCH 07/10] staging: rtl8188eu: rename BlinkHandler " Michael Straube
@ 2018-11-21 19:49 ` Michael Straube
2018-11-21 19:49 ` [PATCH 09/10] staging: rtl8188eu: rename LedControl8188eu to avoid CamelCase Michael Straube
2018-11-21 19:49 ` [PATCH 10/10] staging: rtl8188eu: rename SwLed0 " Michael Straube
8 siblings, 0 replies; 10+ messages in thread
From: Michael Straube @ 2018-11-21 19:49 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
The comment for blink_handler() adds no extra information
in addition to the function name, so remove it.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_led.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index 481e2f1930c1..99ebaf5e4548 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -455,10 +455,6 @@ static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAct
("Led %d\n", pLed->CurrLedState));
}
-/* */
-/* Description: */
-/* Handler function of LED Blinking. */
-/* */
void blink_handler(struct LED_871x *pLed)
{
struct adapter *padapter = pLed->padapter;
--
2.19.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 09/10] staging: rtl8188eu: rename LedControl8188eu to avoid CamelCase
2018-11-21 19:49 [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c Michael Straube
` (6 preceding siblings ...)
2018-11-21 19:49 ` [PATCH 08/10] staging: rtl8188eu: cleanup a function comment Michael Straube
@ 2018-11-21 19:49 ` Michael Straube
2018-11-21 19:49 ` [PATCH 10/10] staging: rtl8188eu: rename SwLed0 " Michael Straube
8 siblings, 0 replies; 10+ messages in thread
From: Michael Straube @ 2018-11-21 19:49 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Rename the function LedControl8188eu to avoid CamelCase.
LedControl8188eu -> led_control_8188eu
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_cmd.c | 6 +++---
drivers/staging/rtl8188eu/core/rtw_led.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_mlme.c | 4 ++--
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_recv.c | 4 ++--
drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 +-
drivers/staging/rtl8188eu/include/rtw_led.h | 2 +-
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 8 ++++----
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_cmd.c b/drivers/staging/rtl8188eu/core/rtw_cmd.c
index 9b2a497aa413..f6dbcf6fe39b 100644
--- a/drivers/staging/rtl8188eu/core/rtw_cmd.c
+++ b/drivers/staging/rtl8188eu/core/rtw_cmd.c
@@ -294,7 +294,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid,
mod_timer(&pmlmepriv->scan_to_timer,
jiffies + msecs_to_jiffies(SCANNING_TIMEOUT));
- LedControl8188eu(padapter, LED_CTL_SITE_SURVEY);
+ led_control_8188eu(padapter, LED_CTL_SITE_SURVEY);
pmlmepriv->scan_interval = SCAN_INTERVAL;/* 30*2 sec = 60sec */
} else {
@@ -318,7 +318,7 @@ u8 rtw_createbss_cmd(struct adapter *padapter)
struct wlan_bssid_ex *pdev_network = &padapter->registrypriv.dev_network;
u8 res = _SUCCESS;
- LedControl8188eu(padapter, LED_CTL_START_TO_LINK);
+ led_control_8188eu(padapter, LED_CTL_START_TO_LINK);
if (pmlmepriv->assoc_ssid.SsidLength == 0)
RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, (" createbss for Any SSid:%s\n", pmlmepriv->assoc_ssid.Ssid));
@@ -360,7 +360,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;
- LedControl8188eu(padapter, LED_CTL_START_TO_LINK);
+ led_control_8188eu(padapter, LED_CTL_START_TO_LINK);
if (pmlmepriv->assoc_ssid.SsidLength == 0)
RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("+Join cmd: Any SSid\n"));
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index 99ebaf5e4548..ab68eb808c49 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -465,7 +465,7 @@ void blink_handler(struct LED_871x *pLed)
SwLedBlink1(pLed);
}
-void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction)
+void led_control_8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction)
{
if (padapter->bSurpriseRemoved || padapter->bDriverStopped ||
!padapter->hw_init_completed)
diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index b9bd864f323c..e5c8b02e6ab2 100644
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -785,7 +785,7 @@ void rtw_indicate_connect(struct adapter *padapter)
if (!check_fwstate(&padapter->mlmepriv, _FW_LINKED)) {
set_fwstate(pmlmepriv, _FW_LINKED);
- LedControl8188eu(padapter, LED_CTL_LINK);
+ led_control_8188eu(padapter, LED_CTL_LINK);
rtw_os_indicate_connect(padapter);
}
@@ -816,7 +816,7 @@ void rtw_indicate_disconnect(struct adapter *padapter)
rtw_os_indicate_disconnect(padapter);
_clr_fwstate_(pmlmepriv, _FW_LINKED);
- LedControl8188eu(padapter, LED_CTL_NO_LINK);
+ led_control_8188eu(padapter, LED_CTL_NO_LINK);
rtw_clear_scan_deny(padapter);
}
diff --git a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
index 9764e85c000c..6a846d08d449 100644
--- a/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8188eu/core/rtw_pwrctrl.c
@@ -47,7 +47,7 @@ static int rtw_hw_suspend(struct adapter *padapter)
if (check_fwstate(pmlmepriv, _FW_LINKED)) {
_clr_fwstate_(pmlmepriv, _FW_LINKED);
- LedControl8188eu(padapter, LED_CTL_NO_LINK);
+ led_control_8188eu(padapter, LED_CTL_NO_LINK);
rtw_os_indicate_disconnect(padapter);
diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index dc447cc78c32..7c667a38077b 100644
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -1229,7 +1229,7 @@ static int validate_recv_frame(struct adapter *adapter,
retval = _FAIL; /* only data frame return _SUCCESS */
break;
case WIFI_DATA_TYPE: /* data */
- LedControl8188eu(adapter, LED_CTL_RX);
+ led_control_8188eu(adapter, LED_CTL_RX);
pattrib->qos = (subtype & BIT(7)) ? 1 : 0;
retval = validate_recv_data_frame(adapter, precv_frame);
if (retval == _FAIL) {
@@ -1912,7 +1912,7 @@ static int recv_func_posthandle(struct adapter *padapter,
struct __queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
/* DATA FRAME */
- LedControl8188eu(padapter, LED_CTL_RX);
+ led_control_8188eu(padapter, LED_CTL_RX);
prframe = decryptor(padapter, prframe);
if (!prframe) {
diff --git a/drivers/staging/rtl8188eu/core/rtw_xmit.c b/drivers/staging/rtl8188eu/core/rtw_xmit.c
index b218b9deff7b..6a2d044ec02b 100644
--- a/drivers/staging/rtl8188eu/core/rtw_xmit.c
+++ b/drivers/staging/rtl8188eu/core/rtw_xmit.c
@@ -1606,7 +1606,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
}
pxmitframe->pkt = *ppkt;
- LedControl8188eu(padapter, LED_CTL_TX);
+ led_control_8188eu(padapter, LED_CTL_TX);
pxmitframe->attrib.qsel = pxmitframe->attrib.priority;
diff --git a/drivers/staging/rtl8188eu/include/rtw_led.h b/drivers/staging/rtl8188eu/include/rtw_led.h
index 80f8dcce05dc..e09ba8d2141b 100644
--- a/drivers/staging/rtl8188eu/include/rtw_led.h
+++ b/drivers/staging/rtl8188eu/include/rtw_led.h
@@ -76,7 +76,7 @@ struct LED_871x {
((struct LED_871x *)_LED_871x)->CurrLedState == LED_BLINK_WPS_STOP || \
((struct LED_871x *)_LED_871x)->bLedWPSBlinkInProgress)
-void LedControl8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction);
+void led_control_8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction);
struct led_priv {
/* add for led control */
diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index dac9f98b4808..fb213a90ed1b 100644
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -578,7 +578,7 @@ static int _netdev_open(struct net_device *pnetdev)
}
rtw_hal_inirp_init(padapter);
- LedControl8188eu(padapter, LED_CTL_NO_LINK);
+ led_control_8188eu(padapter, LED_CTL_NO_LINK);
padapter->bup = true;
}
@@ -661,7 +661,7 @@ int rtw_ips_pwr_up(struct adapter *padapter)
result = ips_netdrv_open(padapter);
- LedControl8188eu(padapter, LED_CTL_NO_LINK);
+ led_control_8188eu(padapter, LED_CTL_NO_LINK);
DBG_88E("<=== rtw_ips_pwr_up.............. in %dms\n",
jiffies_to_msecs(jiffies - start_time));
@@ -676,7 +676,7 @@ void rtw_ips_pwr_down(struct adapter *padapter)
padapter->net_closed = true;
- LedControl8188eu(padapter, LED_CTL_POWER_OFF);
+ led_control_8188eu(padapter, LED_CTL_POWER_OFF);
rtw_ips_dev_unload(padapter);
DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n",
@@ -728,7 +728,7 @@ static int netdev_close(struct net_device *pnetdev)
/* s2-4. */
rtw_free_network_queue(padapter, true);
/* Close LED */
- LedControl8188eu(padapter, LED_CTL_POWER_OFF);
+ led_control_8188eu(padapter, LED_CTL_POWER_OFF);
}
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("-88eu_drv - drv_close\n"));
--
2.19.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 10/10] staging: rtl8188eu: rename SwLed0 to avoid CamelCase
2018-11-21 19:49 [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c Michael Straube
` (7 preceding siblings ...)
2018-11-21 19:49 ` [PATCH 09/10] staging: rtl8188eu: rename LedControl8188eu to avoid CamelCase Michael Straube
@ 2018-11-21 19:49 ` Michael Straube
8 siblings, 0 replies; 10+ messages in thread
From: Michael Straube @ 2018-11-21 19:49 UTC (permalink / raw)
To: gregkh; +Cc: devel, linux-kernel, Michael Straube
Rename struct field SwLed0 to avoid CamelCase.
SwLed0 -> sw_led
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/rtl8188eu/core/rtw_led.c | 2 +-
drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 4 ++--
drivers/staging/rtl8188eu/include/rtw_led.h | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8188eu/core/rtw_led.c b/drivers/staging/rtl8188eu/core/rtw_led.c
index ab68eb808c49..d1406cc99768 100644
--- a/drivers/staging/rtl8188eu/core/rtw_led.c
+++ b/drivers/staging/rtl8188eu/core/rtw_led.c
@@ -240,7 +240,7 @@ static void SwLedBlink1(struct LED_871x *pLed)
static void SwLedControlMode1(struct adapter *padapter, enum LED_CTL_MODE LedAction)
{
struct led_priv *ledpriv = &padapter->ledpriv;
- struct LED_871x *pLed = &ledpriv->SwLed0;
+ struct LED_871x *pLed = &ledpriv->sw_led;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
switch (LedAction) {
diff --git a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
index 1d8832550dfd..35806b27fdee 100644
--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_led.c
@@ -44,12 +44,12 @@ void rtw_hal_sw_led_init(struct adapter *padapter)
{
struct led_priv *pledpriv = &padapter->ledpriv;
- InitLed871x(padapter, &pledpriv->SwLed0);
+ InitLed871x(padapter, &pledpriv->sw_led);
}
void rtw_hal_sw_led_deinit(struct adapter *padapter)
{
struct led_priv *ledpriv = &padapter->ledpriv;
- DeInitLed871x(&ledpriv->SwLed0);
+ DeInitLed871x(&ledpriv->sw_led);
}
diff --git a/drivers/staging/rtl8188eu/include/rtw_led.h b/drivers/staging/rtl8188eu/include/rtw_led.h
index e09ba8d2141b..ee62ed76a465 100644
--- a/drivers/staging/rtl8188eu/include/rtw_led.h
+++ b/drivers/staging/rtl8188eu/include/rtw_led.h
@@ -79,9 +79,7 @@ struct LED_871x {
void led_control_8188eu(struct adapter *padapter, enum LED_CTL_MODE LedAction);
struct led_priv {
- /* add for led control */
- struct LED_871x SwLed0;
- /* add for led control */
+ struct LED_871x sw_led;
};
void BlinkWorkItemCallback(struct work_struct *work);
--
2.19.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-11-21 19:50 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-21 19:49 [PATCH 01/10] staging: rtl8188eu: remove unnecessary parentheses in rtl8188eu_led.c Michael Straube
2018-11-21 19:49 ` [PATCH 02/10] staging: rtl8188eu: cleanup comments " Michael Straube
2018-11-21 19:49 ` [PATCH 03/10] staging: rtl8188eu: add spaces around '&' " Michael Straube
2018-11-21 19:49 ` [PATCH 04/10] staging: rtl8188eu: rename LedCfg to avoid CamelCase Michael Straube
2018-11-21 19:49 ` [PATCH 05/10] staging: rtl8188eu: rename SwLedOn " Michael Straube
2018-11-21 19:49 ` [PATCH 06/10] staging: rtl8188eu: rename SwLedOff " Michael Straube
2018-11-21 19:49 ` [PATCH 07/10] staging: rtl8188eu: rename BlinkHandler " Michael Straube
2018-11-21 19:49 ` [PATCH 08/10] staging: rtl8188eu: cleanup a function comment Michael Straube
2018-11-21 19:49 ` [PATCH 09/10] staging: rtl8188eu: rename LedControl8188eu to avoid CamelCase Michael Straube
2018-11-21 19:49 ` [PATCH 10/10] staging: rtl8188eu: rename SwLed0 " 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).