* [PATCH] Staging: rtl8712: Coding style warnings fix for block comments
@ 2015-09-22 19:08 Punit Vara
0 siblings, 0 replies; 2+ messages in thread
From: Punit Vara @ 2015-09-22 19:08 UTC (permalink / raw)
To: Larry.Finger
Cc: florian.c.schilhabel, gregkh, devel, linux-kernel, Punit Vara
This patch is to the hal_init.c that fixes up following warning
reported by checkpatch.pl :
-Block comments use * subsequent lines
-Block comments use a trailing */ on a separate line
Signed-off-by: Punit Vara <punitvara@gmail.com>
---
drivers/staging/rtl8712/hal_init.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/rtl8712/hal_init.c b/drivers/staging/rtl8712/hal_init.c
index 0a1c631..87e7ab3 100644
--- a/drivers/staging/rtl8712/hal_init.c
+++ b/drivers/staging/rtl8712/hal_init.c
@@ -296,8 +296,10 @@ static u8 rtl8712_dl_fw(struct _adapter *padapter)
goto exit_fail;
tmp8 = r8712_read8(padapter, 0x1025000A);
- if (tmp8 & BIT(4)) /* When boot from EEPROM,
- & FW need more time to read EEPROM */
+ if (tmp8 & BIT(4)) /*
+ * When boot from EEPROM,
+ * & FW need more time to read EEPROM
+ */
i = 60;
else /* boot from EFUSE */
i = 30;
@@ -330,8 +332,10 @@ uint rtl8712_hal_init(struct _adapter *padapter)
netdev_info(padapter->pnetdev, "1 RCR=0x%x\n",
r8712_read32(padapter, RCR));
val32 = r8712_read32(padapter, RCR);
- r8712_write32(padapter, RCR, (val32 | BIT(26))); /* Enable RX TCP
- Checksum offload */
+ r8712_write32(padapter, RCR, (val32 | BIT(26))); /*
+ * Enable RX TCP
+ * Checksum offload
+ */
netdev_info(padapter->pnetdev, "2 RCR=0x%x\n",
r8712_read32(padapter, RCR));
val32 = r8712_read32(padapter, RCR);
@@ -344,8 +348,10 @@ uint rtl8712_hal_init(struct _adapter *padapter)
BIT(0)); /* page = 128bytes */
r8712_write8(padapter, 0x102500BD, r8712_read8(padapter, 0x102500BD) |
BIT(7)); /* enable usb rx aggregation */
- r8712_write8(padapter, 0x102500D9, 1); /* TH=1 => means that invalidate
- * usb rx aggregation */
+ r8712_write8(padapter, 0x102500D9, 1); /*
+ * TH=1 => means that invalidate
+ * usb rx aggregation
+ */
r8712_write8(padapter, 0x1025FE5B, 0x04); /* 1.7ms/4 */
/* Fix the RX FIFO issue(USB error) */
r8712_write8(padapter, 0x1025fe5C, r8712_read8(padapter, 0x1025fe5C)
@@ -365,8 +371,10 @@ uint rtl8712_hal_deinit(struct _adapter *padapter)
r8712_write8(padapter, SYS_CLKR+1, 0x38); /* Switch Control Path */
r8712_write8(padapter, SYS_FUNC_EN+1, 0x70);
r8712_write8(padapter, PMC_FSM, 0x06); /* Enable Loader Data Keep */
- r8712_write8(padapter, SYS_ISO_CTRL, 0xF9); /* Isolation signals from
- * CORE, PLL */
+ r8712_write8(padapter, SYS_ISO_CTRL, 0xF9); /*
+ * Isolation signals from
+ * CORE, PLL
+ */
r8712_write8(padapter, SYS_ISO_CTRL+1, 0xe8); /* Enable EFUSE 1.2V */
r8712_write8(padapter, AFE_PLL_CTRL, 0x00); /* Disable AFE PLL. */
r8712_write8(padapter, LDOA15_CTRL, 0x54); /* Disable A15V */
--
2.5.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] Staging: rtl8712: Coding Style warnings fix for block comments
@ 2015-09-23 20:45 Punit Vara
0 siblings, 0 replies; 2+ messages in thread
From: Punit Vara @ 2015-09-23 20:45 UTC (permalink / raw)
To: Larry.Finger
Cc: florian.c.schilhabel, gregkh, devel, linux-kernel, Punit Vara
This is patch to the rtl871x_pwrctrl.c file that fixes following warning
reported by checkpatch.pl :
-Block comments use a trailing */ on a separate line
-Block comments use * on subsequent lines
Signed-off-by: Punit Vara <punitvara@gmail.com>
---
drivers/staging/rtl8712/rtl871x_pwrctrl.c | 41 ++++++++++++++++---------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.c b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
index 9bc04f4..5b8381a 100644
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.c
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
@@ -53,7 +53,8 @@ void r8712_set_rpwm(struct _adapter *padapter, u8 val8)
pwrpriv->cpwm = val8;
break;
case PS_STATE_S2:/* only for USB normal powersave mode use,
- * temp mark some code. */
+ * temp mark some code.
+ */
case PS_STATE_S3:
case PS_STATE_S4:
pwrpriv->cpwm = val8;
@@ -191,19 +192,19 @@ void r8712_init_pwrctrl_priv(struct _adapter *padapter)
}
/*
-Caller: r8712_cmd_thread
-
-Check if the fw_pwrstate is okay for issuing cmd.
-If not (cpwm should be is less than P2 state), then the sub-routine
-will raise the cpwm to be greater than or equal to P2.
-
-Calling Context: Passive
-
-Return Value:
-
-_SUCCESS: r8712_cmd_thread can issue cmds to firmware afterwards.
-_FAIL: r8712_cmd_thread can not do anything.
-*/
+ * Caller: r8712_cmd_thread
+ *
+ * Check if the fw_pwrstate is okay for issuing cmd.
+ * If not (cpwm should be is less than P2 state), then the sub-routine
+ * will raise the cpwm to be greater than or equal to P2.
+ *
+ * Calling Context: Passive
+ *
+ * Return Value:
+ *
+ * _SUCCESS: r8712_cmd_thread can issue cmds to firmware afterwards.
+ * _FAIL: r8712_cmd_thread can not do anything.
+ */
sint r8712_register_cmd_alive(struct _adapter *padapter)
{
uint res = _SUCCESS;
@@ -220,12 +221,12 @@ sint r8712_register_cmd_alive(struct _adapter *padapter)
}
/*
-Caller: ISR
-
-If ISR's txdone,
-No more pkts for TX,
-Then driver shall call this fun. to power down firmware again.
-*/
+ * Caller: ISR
+ *
+ * If ISR's txdone,
+ * No more pkts for TX,
+ * Then driver shall call this fun. to power down firmware again.
+ */
void r8712_unregister_cmd_alive(struct _adapter *padapter)
{
--
2.5.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-09-23 20:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-23 20:45 [PATCH] Staging: rtl8712: Coding Style warnings fix for block comments Punit Vara
-- strict thread matches above, loose matches on Subject: below --
2015-09-22 19:08 [PATCH] Staging: rtl8712: Coding style " Punit Vara
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox