2015-05-05 06:01:55

by Okash Khawaja

Subject: [PATCH v3] 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 11:45:22

by Okash Khawaja

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

On Mon, May 04, 2015 at 11:44:58PM -0700, Joe Perches wrote:
> On Tue, 2015-05-05 at 07:01 +0100, Okash Khawaja wrote:
> > This patch fixes the checkpatch.pl error:
>
> Please fix the space/tab use too.
>
> Your email client seems to have converted all the tabs
> to spaces.
>
> default should use the same indent as the case statements
>

Joe and Kalle,

I have adjusted the patch. Since indentation of default adds more to the
patch I have resent it under the subject '[PATCH] adm8211: fix
checkpatch errors for indentation and new line around switch-case'.
Thanks for the prompt feedback. I appreciate your patience.

>
> > diff --git 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;
> > }
> > }
> >
>

2015-05-05 06:45:01

by Joe Perches

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

On Tue, 2015-05-05 at 07:01 +0100, Okash Khawaja wrote:
> This patch fixes the checkpatch.pl error:

Please fix the space/tab use too.

Your email client seems to have converted all the tabs
to spaces.

default should use the same indent as the case statements


> diff --git 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;
> }
> }
>