Skip to contentSkip to conversation

pvrusb2: fix remaining checkpatch.pl complaints

PATCH NAK Dan Carpenter 2 participants 2 messages Mar 26, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/6 pvrusb2: fix remaining checkpatch.pl complaints

* Include <linux/string.h> instead of <asm/string.h>.
* Remove unneeded curly braces.

drivers/media/video/pvrusb2/pvrusb2-std.c +2 -3
index a5d4867..370a9ab 100644
@@ -20,7 +20,7 @@
 
 #include "pvrusb2-std.h"
 #include "pvrusb2-debug.h"
-#include <asm/string.h>
+#include <linux/string.h>
 #include <linux/slab.h>
 
 struct std_name {
@@ -294,9 +294,8 @@ static struct v4l2_standard *match_std(v4l2_std_id id)
 	unsigned int idx;
 
 	for (idx = 0; idx < generic_standards_cnt; idx++) {
-		if (generic_standards[idx].id & id) {
+		if (generic_standards[idx].id & id)
 			return generic_standards + idx;
-		}
 	}
 	return NULL;
 }
Nacked-By on v1 2/6 NAK
#1 lore raw

Re: [PATCH 2/6] [media] pvrusb2: fix remaining checkpatch.pl

I am OK with the #include change, but NOT the if-statement change. But since it's bundled into one patch...

Quoted 30 lines · Dan Carpenter

* Include <linux/string.h> instead of <asm/string.h>.
* Remove unneeded curly braces.

drivers/media/video/pvrusb2/pvrusb2-std.c +2 -3
index a5d4867..370a9ab 100644
@@ -20,7 +20,7 @@
 
 #include "pvrusb2-std.h"
 #include "pvrusb2-debug.h"
-#include <asm/string.h>
+#include <linux/string.h>
 #include <linux/slab.h>
 
 struct std_name {
@@ -294,9 +294,8 @@ static struct v4l2_standard *match_std(v4l2_std_id id)
 	unsigned int idx;
 
 	for (idx = 0; idx < generic_standards_cnt; idx++) {
-		if (generic_standards[idx].id & id) {
+		if (generic_standards[idx].id & id)
 			return generic_standards + idx;
-		}
 	}
 	return NULL;
 }
Signature · 3 lines
Mike Isely
isely @ isely (dot) net
PGP: 03 54 43 4D 75 E5 CC 92 71 16 01 E2 B5 F5 C1 E8