2015-05-03 10:42:35

by Okash Khawaja

Subject: [PATCH] staging: adm8211: fix checkpatch error for trailing statements on next line

This patch fixes the checkpatch.pl error:

ERROR: trailing statements should be on next line

More specifically, the fix has been applied to the four occurances of the error listed below.

ERROR: trailing statements should be on next line
#1101: FILE: drivers/net/wireless/adm8211.c:1101:
+ case 0x8: reg |= (0x1 << 14);

ERROR: trailing statements should be on next line
#1103: FILE: drivers/net/wireless/adm8211.c:1103:
+ case 0x16: reg |= (0x2 << 14);

ERROR: trailing statements should be on next line
#1105: FILE: drivers/net/wireless/adm8211.c:1105:
+ case 0x32: reg |= (0x3 << 14);

ERROR: trailing statements should be on next line
#1107: FILE: drivers/net/wireless/adm8211.c:1107:
+ default: reg |= (0x0 << 14);

Signed-off-by: Okash Khawaja <[email protected]>
---
drivers/net/wireless/adm8211.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index f07a618..79e4e5f 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1098,14 +1098,18 @@ static void adm8211_hw_init(struct ieee80211_hw *dev)
pci_read_config_byte(priv->pdev, PCI_CACHE_LINE_SIZE, &cline);

switch (cline) {
- case 0x8: reg |= (0x1 << 14);
- break;
- case 0x16: reg |= (0x2 << 14);
- break;
- case 0x32: reg |= (0x3 << 14);
- break;
- default: reg |= (0x0 << 14);
- break;
+ case 0x8:
+ reg |= (0x1 << 14);
+ break;
+ case 0x16:
+ reg |= (0x2 << 14);
+ break;
+ case 0x32:
+ reg |= (0x3 << 14);
+ break;
+ default:
+ reg |= (0x0 << 14);
+ break;
}
}

--
1.9.1

2015-05-05 05:30:58

by Kalle Valo

Subject: Re: [PATCH v2] adm8211: fix checkpatch error for trailing statements on next line

Okash Khawaja <[email protected]> writes:

> On Mon, May 04, 2015 at 03:42:04PM +0300, Kalle Valo wrote:
>> Okash Khawaja <[email protected]> writes:
>>
>> > This patch fixes the checkpatch.pl error:
>> >
>> > ERROR: trailing statements should be on next line
>> >
>> > More specifically, the fix has been applied to the four occurances of the error listed below.
>> >
>> > ERROR: trailing statements should be on next line
>> > #1101: FILE: drivers/net/wireless/adm8211.c:1101:
>> > + case 0x8: reg |= (0x1 << 14);
>> >
>> > ERROR: trailing statements should be on next line
>> > #1103: FILE: drivers/net/wireless/adm8211.c:1103:
>> > + case 0x16: reg |= (0x2 << 14);
>> >
>> > ERROR: trailing statements should be on next line
>> > #1105: FILE: drivers/net/wireless/adm8211.c:1105:
>> > + case 0x32: reg |= (0x3 << 14);
>> >
>> > ERROR: trailing statements should be on next line
>> > #1107: FILE: drivers/net/wireless/adm8211.c:1107:
>> > + default: reg |= (0x0 << 14);
>> >
>> > Signed-off-by: Okash Khawaja <[email protected]>
>> > ---
>> > drivers/net/wireless/adm8211.c | 20 ++++++++++++--------
>> > 1 file changed, 12 insertions(+), 8 deletions(-)
>>
>> The patch has incorrectly "staging:" prefix in the title, please fix
>> that. "adm8211:" is enough, you don't need anything for drivers in
>> drivers/net/wireless.
>>
>> --
>> Kalle Valo
>
> Thanks Kalle for clarifying. I have removed "staging:" prefix and pasted the patch below.
>
> Signed-off-by: Okash Khawaja <[email protected]>

I cannot apply the mail directly as you added the old discussion to the
commit log. Please just resend the whole patch with clean commit log.

--
Kalle Valo

2015-05-04 12:42:14

by Kalle Valo

Subject: Re: [PATCH] staging: adm8211: fix checkpatch error for trailing statements on next line

Okash Khawaja <[email protected]> writes:

> This patch fixes the checkpatch.pl error:
>
> ERROR: trailing statements should be on next line
>
> More specifically, the fix has been applied to the four occurances of the error listed below.
>
> ERROR: trailing statements should be on next line
> #1101: FILE: drivers/net/wireless/adm8211.c:1101:
> + case 0x8: reg |= (0x1 << 14);
>
> ERROR: trailing statements should be on next line
> #1103: FILE: drivers/net/wireless/adm8211.c:1103:
> + case 0x16: reg |= (0x2 << 14);
>
> ERROR: trailing statements should be on next line
> #1105: FILE: drivers/net/wireless/adm8211.c:1105:
> + case 0x32: reg |= (0x3 << 14);
>
> ERROR: trailing statements should be on next line
> #1107: FILE: drivers/net/wireless/adm8211.c:1107:
> + default: reg |= (0x0 << 14);
>
> Signed-off-by: Okash Khawaja <[email protected]>
> ---
> drivers/net/wireless/adm8211.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)

The patch has incorrectly "staging:" prefix in the title, please fix
that. "adm8211:" is enough, you don't need anything for drivers in
drivers/net/wireless.

--
Kalle Valo

2015-05-05 05:19:43

by Okash Khawaja

Subject: Re: [PATCH v2] adm8211: fix checkpatch error for trailing statements on next line

On Mon, May 04, 2015 at 03:42:04PM +0300, Kalle Valo wrote:
> Okash Khawaja <[email protected]> writes:
>
> > This patch fixes the checkpatch.pl error:
> >
> > ERROR: trailing statements should be on next line
> >
> > More specifically, the fix has been applied to the four occurances of the error listed below.
> >
> > ERROR: trailing statements should be on next line
> > #1101: FILE: drivers/net/wireless/adm8211.c:1101:
> > + case 0x8: reg |= (0x1 << 14);
> >
> > ERROR: trailing statements should be on next line
> > #1103: FILE: drivers/net/wireless/adm8211.c:1103:
> > + case 0x16: reg |= (0x2 << 14);
> >
> > ERROR: trailing statements should be on next line
> > #1105: FILE: drivers/net/wireless/adm8211.c:1105:
> > + case 0x32: reg |= (0x3 << 14);
> >
> > ERROR: trailing statements should be on next line
> > #1107: FILE: drivers/net/wireless/adm8211.c:1107:
> > + default: reg |= (0x0 << 14);
> >
> > Signed-off-by: Okash Khawaja <[email protected]>
> > ---
> > drivers/net/wireless/adm8211.c | 20 ++++++++++++--------
> > 1 file changed, 12 insertions(+), 8 deletions(-)
>
> The patch has incorrectly "staging:" prefix in the title, please fix
> that. "adm8211:" is enough, you don't need anything for drivers in
> drivers/net/wireless.
>
> --
> Kalle Valo

Thanks Kalle for clarifying. I have removed "staging:" prefix and pasted the patch below.

Signed-off-by: Okash Khawaja <[email protected]>
---
drivers/net/wireless/adm8211.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index f07a618..79e4e5f 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1098,14 +1098,18 @@ static void adm8211_hw_init(struct ieee80211_hw *dev)
pci_read_config_byte(priv->pdev, PCI_CACHE_LINE_SIZE, &cline);

switch (cline) {
- case 0x8: reg |= (0x1 << 14);
- break;
- case 0x16: reg |= (0x2 << 14);
- break;
- case 0x32: reg |= (0x3 << 14);
- break;
- default: reg |= (0x0 << 14);
- break;
+ case 0x8:
+ reg |= (0x1 << 14);
+ break;
+ case 0x16:
+ reg |= (0x2 << 14);
+ break;
+ case 0x32:
+ reg |= (0x3 << 14);
+ break;
+ default:
+ reg |= (0x0 << 14);
+ break;
}
}

--
1.9.1