[PATCH v2 0/2] adm8211 patches

[PATCH v2 0/2] adm8211 patches

[Okash Khawaja]

These patches include two changes:

1. Code cleanup around a switch-case statement
2. Bug fix for the possible PCI cache line sizes

Okash Khawaja (2):
  adm8211: fix checkpatch errors for indentation and new line.
  adm8211: fixed the possible pci cache line sizes inside switch-case

 drivers/net/wireless/adm8211.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

-- 
2.4.0

[PATCH v2 1/2] adm8211: fix checkpatch errors for indentation and new line

[Okash Khawaja]

This patch fixes these checkpatch.pl errors around a single switch-case
block:

ERROR: switch and case should be at the same indent
ERROR: trailing statements should be on next line

More specifically, the fix has been applied to the five occurances of
the errors listed below.

ERROR: switch and case should be at the same indent
#1100: FILE: adm8211.c:1100:
+               switch (cline) {
[...]
+                 default: reg |= (0x0 << 14);

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

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

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

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


Signed-off-by: Okash Khawaja <okash.khawaja@gmail.com>
---
 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..058fb4b 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;
 		}
 	}
 
-- 
2.4.0

Re: [v2, 1/2] adm8211: fix checkpatch errors for indentation and new line

[Kalle Valo]

> This patch fixes these checkpatch.pl errors around a single switch-case
> block:
> 
> ERROR: switch and case should be at the same indent
> ERROR: trailing statements should be on next line
> 
> More specifically, the fix has been applied to the five occurances of
> the errors listed below.
> 
> ERROR: switch and case should be at the same indent
> #1100: FILE: adm8211.c:1100:
> +               switch (cline) {
> [...]
> +                 default: reg |= (0x0 << 14);
> 
> ERROR: trailing statements should be on next line
> #1101: FILE: adm8211.c:1101:
> +               case  0x8: reg |= (0x1 << 14);
> 
> ERROR: trailing statements should be on next line
> #1103: FILE: adm8211.c:1103:
> +               case 0x16: reg |= (0x2 << 14);
> 
> ERROR: trailing statements should be on next line
> #1105: FILE: adm8211.c:1105:
> +               case 0x32: reg |= (0x3 << 14);
> 
> ERROR: trailing statements should be on next line
> #1107: FILE: adm8211.c:1107:
> +                 default: reg |= (0x0 << 14);
> 
> 
> Signed-off-by: Okash Khawaja <okash.khawaja@gmail.com>

Thanks, 2 patches applied to wireless-drivers-next.git:

f5c65f38912e adm8211: fix checkpatch errors for indentation and new line
fe0a483ecf44 adm8211: fixed the possible pci cache line sizes inside switch-case

Kalle Valo

[PATCH v2 2/2] adm8211: fixed the possible pci cache line sizes inside switch-case

[Okash Khawaja]

The PCI cache line size value was being compared against decimal values
prefixed with 0x.

Fixed the literals to use the correct hex values.

This has not been tested due to lack of hardware. However, the value in 
`cline` is PCI cache line size, which is the CPU's cache line size. 
It is less likely for cache line sizes to be 22 or 50, and more likely for 
them to be 16 or 32. Also, as far as I understand, cache line size is used for
things like aligning DMA requests with CPU cache line, which improve
performance but wouldn't break anything if the value doesn't match. In
this case, we will fall through to the default case which leaves `reg`
unchanged.


Signed-off-by: Okash Khawaja <okash.khawaja@gmail.com>
---
 drivers/net/wireless/adm8211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 058fb4b..76c908f 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1101,10 +1101,10 @@ static void adm8211_hw_init(struct ieee80211_hw *dev)
 		case  0x8:
 			reg |= (0x1 << 14);
 			break;
-		case 0x16:
+		case 0x10:
 			reg |= (0x2 << 14);
 			break;
-		case 0x32:
+		case 0x20:
 			reg |= (0x3 << 14);
 			break;
 		default:
-- 
2.4.0