Staging: batman-adv: Fix whitespace problems criticized by checkpatch.pl

Trailing spaces at the end of a line or before a tab are against
Documentation/CodingStyle "3.1: Spaces" and should be avoided. It is
also common style to add a single space after commas unless it is
followed either by a newline or a tab.

Reported-by: Mikal Sande <mikal.sande@gmail.com>
Reported-by: Luis de Bethencourt <luisbg@ubuntu.com>
Signed-off-by: Sven Eckelmann <sven.eckelmann@gmx.de>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/batman-adv/main.h b/drivers/staging/batman-adv/main.h
index 6749ce036b91cb8014ac1374dd4431af4eb76c84..8818e2b809382ebb1013f20f0863f06e5c9e1ed0 100644 (file)
--- a/drivers/staging/batman-adv/main.h
+++ b/drivers/staging/batman-adv/main.h
@@ -70,7 +70,7 @@
 #define MODULE_DEACTIVATING 2
 
 #define BCAST_QUEUE_LEN 256
-#define BATMAN_QUEUE_LE        256
+#define BATMAN_QUEUE_LEN       256
 
 /*
  * Debug Messages

diff --git a/drivers/staging/batman-adv/originator.c b/drivers/staging/batman-adv/originator.c
index 01d71d7ed4201652c454cacec1ce762fa4ff5027..25a9e215e1a0c47934d2da249f2a5cf7827fd189 100644 (file)
--- a/drivers/staging/batman-adv/originator.c
+++ b/drivers/staging/batman-adv/originator.c
@@ -297,7 +297,7 @@ ssize_t orig_fill_buffer_text(struct net_device *net_dev, char *buff,
 
        rcu_read_lock();
        hdr_len = sprintf(buff,
-                  "  %-14s (%s/%i) %17s [%10s]: %20s ... [B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s (%s)] \n",
+                  "  %-14s (%s/%i) %17s [%10s]: %20s ... [B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s (%s)]\n",
                   "Originator", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF",
                   "Potential nexthops", SOURCE_VERSION, REVISION_VERSION_STR,
                   bat_priv->primary_if->dev, bat_priv->primary_if->addr_str,
@@ -354,7 +354,7 @@ ssize_t orig_fill_buffer_text(struct net_device *net_dev, char *buff,
 
        if ((batman_count == 0) && (off == 0))
                bytes_written += sprintf(buff + bytes_written,
-                                       "No batman nodes in range ... \n");
+                                       "No batman nodes in range ...\n");
 
        return bytes_written;
 }

diff --git a/drivers/staging/batman-adv/types.h b/drivers/staging/batman-adv/types.h
index c92621965b3d79b1d058edc928598df92a47a883..0b1fe9e95441d1a84f91fc500dabc22e9892ca59 100644 (file)
--- a/drivers/staging/batman-adv/types.h
+++ b/drivers/staging/batman-adv/types.h
@@ -59,8 +59,7 @@ struct orig_node {               /* structure for orig_list maintaining nodes of
                                            seqno window was reset. */
        unsigned long batman_seqno_reset;/* time when the batman seqno
                                            window was reset. */
-/*     uint8_t  gwflags;      * flags related to gateway functions: gateway class */
-       uint8_t  flags;                 /* for now only VIS_SERVER flag. */
+       uint8_t  flags;                  /* for now only VIS_SERVER flag. */
        unsigned char *hna_buff;
        int16_t  hna_buff_len;
        uint16_t last_real_seqno;   /* last and best known squence number */

diff --git a/drivers/staging/batman-adv/vis.c b/drivers/staging/batman-adv/vis.c
index b6ff031a34d0cb49d4d7d600461013c8cb03bacf..1d3d954847fdaa4dc18c7fce12ea6d27ba23e2e0 100644 (file)
--- a/drivers/staging/batman-adv/vis.c
+++ b/drivers/staging/batman-adv/vis.c
@@ -40,7 +40,7 @@
     * when adding 128 - it is neither a predecessor nor a successor,
     * after adding more than 127 to the starting value - it is a successor */
 #define seq_before(x, y) ({typeof(x) _dummy = (x - y); \
-                         _dummy > smallest_signed_int(_dummy); })
+                       _dummy > smallest_signed_int(_dummy); })
 #define seq_after(x, y) seq_before(y, x)
 
 struct hashtable_t *vis_hash;