Skip to contentSkip to conversation

staging: frontier: alphatrack: fixed coding style issues

PATCH In review Audun Hoem 2 participants 4 messages Nov 2, 2010 Staging

lore
Share & tools
lore

Audun Hoem

author
#0 lore raw

PATCH 1/1 staging: frontier: alphatrack: fixed coding style issues

Cleaned up a macro definition and another simple style warning.

---
 drivers/staging/frontier/alphatrack.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/staging/frontier/alphatrack.c +6 -3
index ef7fbf8..6e3bd73 100644
@@ -88,8 +88,11 @@ MODULE_SUPPORTED_DEVICE("Frontier Designs Alphatrack Control Surface");
 static int debug = ALPHATRACK_DEBUG;
 
 /* Use our own dbg macro */
-#define dbg_info(dev, format, arg...) do \
-    { if (debug) dev_info(dev , format , ## arg); } while (0)
+#define dbg_info(dev, format, arg...) \
+do { \
+	if (debug) \
+		dev_info(dev , format , ## arg); \
+} while (0)
 
 #define alphatrack_ocmd_info(dev, cmd, format, arg...)
 
@@ -769,7 +772,7 @@ static int usb_alphatrack_probe(struct usb_interface *intf,
 	}
 
 	dev->write_buffer =
-	    kmalloc(sizeof(struct alphatrack_ocmd) * true_size, GFP_KERNEL);
+	    kmalloc(sizeof(struct alphatrack_ocmd) *true_size, GFP_KERNEL);
 
 	if (!dev->write_buffer) {
 		dev_err(&intf->dev, "Couldn't allocate write_buffer\n");
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 11 lines · Audun Hoem

Cleaned up a macro definition and another simple style warning.

---
 drivers/staging/frontier/alphatrack.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/staging/frontier/alphatrack.c +0 -0
index ef7fbf8..6e3bd73 100644

drivers/staging/frontier/alphatrack.c MODULE_SUPPORTED_DEVICE("Frontier Designs Alphatrack Control Surface"); · line 94

Quoted 9 lines
drivers/staging/frontier/alphatrack.c +4 -2
@@ -88,8 +88,11 @@ MODULE_SUPPORTED_DEVICE("Frontier Designs Alphatrack Control Surface");
 static int debug = ALPHATRACK_DEBUG;
 
 /* Use our own dbg macro */
-#define dbg_info(dev, format, arg...) do \
-    { if (debug) dev_info(dev , format , ## arg); } while (0)
+#define dbg_info(dev, format, arg...) \
+do { \
+	if (debug) \
+		dev_info(dev , format , ## arg); \

There is no need for the spaces before commas.

gcc 2.xx required a space before a comma with a trailing ##arg, but that compiler version is no longer supported.

This should be:

	dev_info(dev, format, ##arg);

though I think using dev_dbg and getting rid of the dbg_info macro is better.

drivers/staging/frontier/alphatrack.c static int usb_alphatrack_probe(struct usb_interface *intf, · line 775

Quoted 10 lines
drivers/staging/frontier/alphatrack.c +2 -1
+} while (0)
 
 #define alphatrack_ocmd_info(dev, cmd, format, arg...)
 
@@ -769,7 +772,7 @@ static int usb_alphatrack_probe(struct usb_interface *intf,
 	}
 
 	dev->write_buffer =
-	    kmalloc(sizeof(struct alphatrack_ocmd) * true_size, GFP_KERNEL);
+	    kmalloc(sizeof(struct alphatrack_ocmd) *true_size, GFP_KERNEL);

Not an improvement.

If checkpatch warns about this, it's a checkpatch defect.

author
#2 lore raw
Quoted 26 lines · Joe Perches
Quoted 12 lines · Audun Hoem

Cleaned up a macro definition and another simple style warning.

---
 drivers/staging/frontier/alphatrack.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
drivers/staging/frontier/alphatrack.c +0 -0
index ef7fbf8..6e3bd73 100644

drivers/staging/frontier/alphatrack.c MODULE_SUPPORTED_DEVICE("Frontier Designs Alphatrack · line 95

Quoted 10 lines
drivers/staging/frontier/alphatrack.c +4 -2
@@ -88,8 +88,11 @@ MODULE_SUPPORTED_DEVICE("Frontier Designs Alphatrack
 Control Surface");
 static int debug = ALPHATRACK_DEBUG;
 
 /* Use our own dbg macro */
-#define dbg_info(dev, format, arg...) do \
-    { if (debug) dev_info(dev , format , ## arg); } while (0)
+#define dbg_info(dev, format, arg...) \
+do { \
+	if (debug) \
+		dev_info(dev , format , ## arg); \

There is no need for the spaces before commas.

Quoted 9 lines

gcc 2.xx required a space before a comma with a trailing ##arg, but that compiler version is no longer supported.

This should be:

	dev_info(dev, format, ##arg);

though I think using dev_dbg and getting rid of the dbg_info macro is better.

I was planning to remove the patch in a later patch, which I at the time thought was necessary, but in light of this checkpatch fault, I guess I could have just pushed it in this one.

Quoted 8 lines
Quoted 8 lines
drivers/staging/frontier/alphatrack.c +1 -0
+} while (0)
 
 #define alphatrack_ocmd_info(dev, cmd, format, arg...)
@@ -769,7 +772,7 @@ static int usb_alphatrack_probe(struct usb_interface
 *intf,
 	}
 
Quoted 7 lines

drivers/staging/frontier/alphatrack.c static int usb_alphatrack_probe(struct usb_interface *intf, · line 775

Quoted 3 lines
drivers/staging/frontier/alphatrack.c +1 -1
 	dev->write_buffer =
-	    kmalloc(sizeof(struct alphatrack_ocmd) * true_size, GFP_KERNEL);
+	    kmalloc(sizeof(struct alphatrack_ocmd) *true_size, GFP_KERNEL);

Not an improvement.

If checkpatch warns about this, it's a checkpatch defect.

Interesting. Apparently it mistook the multiplication operator for the unary * operator. May take a look at that perl script later.

author
#3 lore raw
Quoted 3 lines

I was planning to remove the patch in a later patch, which I at the time thought was necessary, but in light of this checkpatch fault, I guess I could have just pushed it in this one.

Sorry, meant to say "remove the macro," of course.