* [PATCH 0/4] staging: rtlwifi: Change line and comment spacing
@ 2018-11-08 7:20 Maya Nakamura
2018-11-08 7:21 ` [PATCH 1/4] staging: rtlwifi: Improve line endings Maya Nakamura
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Maya Nakamura @ 2018-11-08 7:20 UTC (permalink / raw)
To: gregkh, outreachy-kernel
Add blank lines at the end of if statements and spaces before and after
comments. Edit statements so that the line does not end with an assignment
operator or a parenthesis. Remove a blank comment, too.
Maya Nakamura (4):
staging: rtlwifi: Improve line endings
staging: rtlwifi: Remove empty comment
staging: rtlwifi: Add blank lines
staging: rtlwifi: Add spaces for comments
drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 10 +++++-----
drivers/staging/rtlwifi/phydm/phydm_ccx.c | 8 +++++---
2 files changed, 10 insertions(+), 8 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/4] staging: rtlwifi: Improve line endings
2018-11-08 7:20 [PATCH 0/4] staging: rtlwifi: Change line and comment spacing Maya Nakamura
@ 2018-11-08 7:21 ` Maya Nakamura
2018-11-08 7:22 ` [PATCH 2/4] staging: rtlwifi: Remove empty comment Maya Nakamura
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Maya Nakamura @ 2018-11-08 7:21 UTC (permalink / raw)
To: gregkh, outreachy-kernel
Edit statements so that the line does not end with an assignment operator
or a parenthesis.
Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
---
drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 6 +++---
drivers/staging/rtlwifi/phydm/phydm_ccx.c | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
index 7853031ee91f..a0bed52b8255 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
@@ -551,9 +551,9 @@ void phydm_lamode_trigger_setting(void *dm_void, char input[][16], u32 *_used,
/*dbg_print("echo cmd input_num = %d\n", input_num);*/
if ((strcmp(input[1], help) == 0)) {
- PHYDM_SNPRINTF(
- output + used, out_len - used,
- "{En} {0:BB,1:BB_MAC,2:RF0,3:RF1,4:MAC}\n {BB:dbg_port[bit],BB_MAC:0-ok/1-fail/2-cca,MAC:ref} {DMA type} {TrigTime}\n {polling_time/ref_mask} {dbg_port} {0:P_Edge, 1:N_Edge} {SpRate:0-80M,1-40M,2-20M} {Capture num}\n");
+ PHYDM_SNPRINTF(output + used,
+ out_len - used,
+ "{En} {0:BB,1:BB_MAC,2:RF0,3:RF1,4:MAC}\n {BB:dbg_port[bit],BB_MAC:0-ok/1-fail/2-cca,MAC:ref} {DMA type} {TrigTime}\n {polling_time/ref_mask} {dbg_port} {0:P_Edge, 1:N_Edge} {SpRate:0-80M,1-40M,2-20M} {Capture num}\n");
/**/
} else if (is_enable_la_mode) {
PHYDM_SSCANF(input[2], DCMD_DECIMAL, &var1[1]);
diff --git a/drivers/staging/rtlwifi/phydm/phydm_ccx.c b/drivers/staging/rtlwifi/phydm/phydm_ccx.c
index f292b23a2db1..ded6642bdf64 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_ccx.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_ccx.c
@@ -331,8 +331,9 @@ bool phydm_check_nhm_ready(void *dm_void)
bool ret = false;
if (dm->support_ic_type & ODM_IC_11AC_SERIES) {
- value32 =
- odm_get_bb_reg(dm, ODM_REG_CLM_RESULT_11AC, MASKDWORD);
+ value32 = odm_get_bb_reg(dm,
+ ODM_REG_CLM_RESULT_11AC,
+ MASKDWORD);
for (i = 0; i < 200; i++) {
ODM_delay_ms(1);
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/4] staging: rtlwifi: Remove empty comment
2018-11-08 7:20 [PATCH 0/4] staging: rtlwifi: Change line and comment spacing Maya Nakamura
2018-11-08 7:21 ` [PATCH 1/4] staging: rtlwifi: Improve line endings Maya Nakamura
@ 2018-11-08 7:22 ` Maya Nakamura
2018-11-08 7:23 ` [PATCH 3/4] staging: rtlwifi: Add blank lines Maya Nakamura
2018-11-08 7:23 ` [PATCH 4/4] staging: rtlwifi: Add spaces for comments Maya Nakamura
3 siblings, 0 replies; 7+ messages in thread
From: Maya Nakamura @ 2018-11-08 7:22 UTC (permalink / raw)
To: gregkh, outreachy-kernel
Remove a comment that does not contain any text.
Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
---
drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
index a0bed52b8255..7eb54d2e48f3 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
@@ -554,7 +554,6 @@ void phydm_lamode_trigger_setting(void *dm_void, char input[][16], u32 *_used,
PHYDM_SNPRINTF(output + used,
out_len - used,
"{En} {0:BB,1:BB_MAC,2:RF0,3:RF1,4:MAC}\n {BB:dbg_port[bit],BB_MAC:0-ok/1-fail/2-cca,MAC:ref} {DMA type} {TrigTime}\n {polling_time/ref_mask} {dbg_port} {0:P_Edge, 1:N_Edge} {SpRate:0-80M,1-40M,2-20M} {Capture num}\n");
- /**/
} else if (is_enable_la_mode) {
PHYDM_SSCANF(input[2], DCMD_DECIMAL, &var1[1]);
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/4] staging: rtlwifi: Add blank lines
2018-11-08 7:20 [PATCH 0/4] staging: rtlwifi: Change line and comment spacing Maya Nakamura
2018-11-08 7:21 ` [PATCH 1/4] staging: rtlwifi: Improve line endings Maya Nakamura
2018-11-08 7:22 ` [PATCH 2/4] staging: rtlwifi: Remove empty comment Maya Nakamura
@ 2018-11-08 7:23 ` Maya Nakamura
2018-11-08 11:28 ` Greg KH
2018-11-08 7:23 ` [PATCH 4/4] staging: rtlwifi: Add spaces for comments Maya Nakamura
3 siblings, 1 reply; 7+ messages in thread
From: Maya Nakamura @ 2018-11-08 7:23 UTC (permalink / raw)
To: gregkh, outreachy-kernel
Add blank lines after if statements.
Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
---
drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 1 +
drivers/staging/rtlwifi/phydm/phydm_ccx.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
index 7eb54d2e48f3..7d578241326b 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
@@ -563,6 +563,7 @@ void phydm_lamode_trigger_setting(void *dm_void, char input[][16], u32 *_used,
PHYDM_SSCANF(input[3], DCMD_HEX, &var1[2]);
else
PHYDM_SSCANF(input[3], DCMD_DECIMAL, &var1[2]);
+
trig_sig_sel = var1[2];
PHYDM_SSCANF(input[4], DCMD_DECIMAL, &var1[3]);
diff --git a/drivers/staging/rtlwifi/phydm/phydm_ccx.c b/drivers/staging/rtlwifi/phydm/phydm_ccx.c
index ded6642bdf64..c0da601be6cf 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_ccx.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_ccx.c
@@ -357,6 +357,7 @@ bool phydm_check_nhm_ready(void *dm_void)
}
}
}
+
return ret;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] staging: rtlwifi: Add spaces for comments
2018-11-08 7:20 [PATCH 0/4] staging: rtlwifi: Change line and comment spacing Maya Nakamura
` (2 preceding siblings ...)
2018-11-08 7:23 ` [PATCH 3/4] staging: rtlwifi: Add blank lines Maya Nakamura
@ 2018-11-08 7:23 ` Maya Nakamura
3 siblings, 0 replies; 7+ messages in thread
From: Maya Nakamura @ 2018-11-08 7:23 UTC (permalink / raw)
To: gregkh, outreachy-kernel
Add spaces before and after text in comments.
Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
---
drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 2 +-
drivers/staging/rtlwifi/phydm/phydm_ccx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
index 7d578241326b..f94c9d19491e 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
@@ -575,7 +575,7 @@ void phydm_lamode_trigger_setting(void *dm_void, char input[][16], u32 *_used,
PHYDM_SSCANF(input[10], DCMD_DECIMAL, &var1[9]);
dma_data_sig_sel = (u8)var1[3];
- trigger_time_mu_sec = var1[4]; /*unit: us*/
+ trigger_time_mu_sec = var1[4]; /* unit: us */
adc_smp->la_mac_ref_mask = var1[5];
adc_smp->la_dbg_port = var1[6];
diff --git a/drivers/staging/rtlwifi/phydm/phydm_ccx.c b/drivers/staging/rtlwifi/phydm/phydm_ccx.c
index c0da601be6cf..80679a6d5047 100644
--- a/drivers/staging/rtlwifi/phydm/phydm_ccx.c
+++ b/drivers/staging/rtlwifi/phydm/phydm_ccx.c
@@ -317,7 +317,7 @@ void phydm_get_nhm_result(void *dm_void)
ccx_info->NHM_result[10] = (u8)((value32 & MASKBYTE2) >> 16);
ccx_info->NHM_result[11] = (u8)((value32 & MASKBYTE3) >> 24);
- /*Get NHM duration*/
+ /* Get NHM duration */
value32 = odm_read_4byte(dm, ODM_REG_NHM_CNT10_TO_CNT11_11N);
ccx_info->NHM_duration = (u16)(value32 & MASKLWORD);
}
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 3/4] staging: rtlwifi: Add blank lines
2018-11-08 7:23 ` [PATCH 3/4] staging: rtlwifi: Add blank lines Maya Nakamura
@ 2018-11-08 11:28 ` Greg KH
2018-11-09 10:15 ` Maya Nakamura
0 siblings, 1 reply; 7+ messages in thread
From: Greg KH @ 2018-11-08 11:28 UTC (permalink / raw)
To: Maya Nakamura; +Cc: outreachy-kernel
On Wed, Nov 07, 2018 at 11:23:07PM -0800, Maya Nakamura wrote:
> Add blank lines after if statements.
That says what you did, but not _why_ you did this.
>
> Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
> ---
> drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 1 +
> drivers/staging/rtlwifi/phydm/phydm_ccx.c | 1 +
> 2 files changed, 2 insertions(+)
>
> diff --git a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
> index 7eb54d2e48f3..7d578241326b 100644
> --- a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
> +++ b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
> @@ -563,6 +563,7 @@ void phydm_lamode_trigger_setting(void *dm_void, char input[][16], u32 *_used,
> PHYDM_SSCANF(input[3], DCMD_HEX, &var1[2]);
> else
> PHYDM_SSCANF(input[3], DCMD_DECIMAL, &var1[2]);
> +
> trig_sig_sel = var1[2];
>
> PHYDM_SSCANF(input[4], DCMD_DECIMAL, &var1[3]);
> diff --git a/drivers/staging/rtlwifi/phydm/phydm_ccx.c b/drivers/staging/rtlwifi/phydm/phydm_ccx.c
> index ded6642bdf64..c0da601be6cf 100644
> --- a/drivers/staging/rtlwifi/phydm/phydm_ccx.c
> +++ b/drivers/staging/rtlwifi/phydm/phydm_ccx.c
> @@ -357,6 +357,7 @@ bool phydm_check_nhm_ready(void *dm_void)
> }
> }
> }
> +
Is this one really needed?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/4] staging: rtlwifi: Add blank lines
2018-11-08 11:28 ` Greg KH
@ 2018-11-09 10:15 ` Maya Nakamura
0 siblings, 0 replies; 7+ messages in thread
From: Maya Nakamura @ 2018-11-09 10:15 UTC (permalink / raw)
To: Greg KH; +Cc: outreachy-kernel
On Thu, Nov 08, 2018 at 03:28:57AM -0800, Greg KH wrote:
> On Wed, Nov 07, 2018 at 11:23:07PM -0800, Maya Nakamura wrote:
> > Add blank lines after if statements.
>
> That says what you did, but not _why_ you did this.
>
> >
> > Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
> > ---
> > drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 1 +
> > drivers/staging/rtlwifi/phydm/phydm_ccx.c | 1 +
> > 2 files changed, 2 insertions(+)
> >
> > diff --git a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
> > index 7eb54d2e48f3..7d578241326b 100644
> > --- a/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
> > +++ b/drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c
> > @@ -563,6 +563,7 @@ void phydm_lamode_trigger_setting(void *dm_void, char input[][16], u32 *_used,
> > PHYDM_SSCANF(input[3], DCMD_HEX, &var1[2]);
> > else
> > PHYDM_SSCANF(input[3], DCMD_DECIMAL, &var1[2]);
> > +
> > trig_sig_sel = var1[2];
> >
> > PHYDM_SSCANF(input[4], DCMD_DECIMAL, &var1[3]);
> > diff --git a/drivers/staging/rtlwifi/phydm/phydm_ccx.c b/drivers/staging/rtlwifi/phydm/phydm_ccx.c
> > index ded6642bdf64..c0da601be6cf 100644
> > --- a/drivers/staging/rtlwifi/phydm/phydm_ccx.c
> > +++ b/drivers/staging/rtlwifi/phydm/phydm_ccx.c
> > @@ -357,6 +357,7 @@ bool phydm_check_nhm_ready(void *dm_void)
> > }
> > }
> > }
> > +
>
> Is this one really needed?
>
> thanks,
>
> greg k-h
Hi Greg,
Thank you for accepting three of my four patches in this patchset!
I read several examples that use if statements in K&R and didn't find a
blank line between them and the next statements. I thought that it is
easier to read with a blank line, but it is just my personal preference,
so it is not necessary. Therefore, I won't resubmit this patch.
Maya
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-11-09 10:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-08 7:20 [PATCH 0/4] staging: rtlwifi: Change line and comment spacing Maya Nakamura
2018-11-08 7:21 ` [PATCH 1/4] staging: rtlwifi: Improve line endings Maya Nakamura
2018-11-08 7:22 ` [PATCH 2/4] staging: rtlwifi: Remove empty comment Maya Nakamura
2018-11-08 7:23 ` [PATCH 3/4] staging: rtlwifi: Add blank lines Maya Nakamura
2018-11-08 11:28 ` Greg KH
2018-11-09 10:15 ` Maya Nakamura
2018-11-08 7:23 ` [PATCH 4/4] staging: rtlwifi: Add spaces for comments Maya Nakamura
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.