Device interface coding style cleanup (dev.c, dev.h)

According to Linux coding style:

- Don't use assignments in if statements.
- EXPORT_SYMBOL() has to follow directly it's function.
- Use the standard __func_ instead of gcc specific __FUNCTION__.
- Labels should not be indented.
- No braces should be put around single statements.
- Pointers have to be written as "foo *bar", not "foo * bar".
- Static data doesn't have to be initialized with 0.

Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
git-svn-id: svn://svn.berlios.de//socketcan/trunk@762 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/dev.c b/kernel/2.6/drivers/net/can/dev.c
index eb487492dbbb4e936b3e6519ac65a25fc884a398..253fa87c11e88db8dff31d0591a1d25d0970c29a 100644 (file)
--- a/kernel/2.6/drivers/net/can/dev.c
+++ b/kernel/2.6/drivers/net/can/dev.c
@@ -32,7 +32,7 @@ MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Marc Kleine-Budde <mkl@pengutronix.de>, "
              "Andrey Volkov <avolkov@varma-el.com>");
 
-static int restart_ms = 0;
+static int restart_ms;
 
 module_param(restart_ms, int, S_IRUGO | S_IWUSR);
 
@@ -158,7 +158,7 @@ int can_calc_bittime(struct can_priv *can, u32 bitrate,
                                }
                        }
                }
-             next_brp:;
+next_brp:;
        }
 
        if (best_error < 0)
@@ -246,14 +246,12 @@ struct net_device *alloc_candev(int sizeof_priv)
 
        return dev;
 }
-
 EXPORT_SYMBOL(alloc_candev);
 
 void free_candev(struct net_device *dev)
 {
        free_netdev(dev);
 }
-
 EXPORT_SYMBOL(free_candev);
 
 /*
@@ -305,9 +303,8 @@ void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev, int idx)
 
                        skb = skb_clone(old_skb, GFP_ATOMIC);
                        kfree_skb(old_skb);
-                       if (!skb) {
+                       if (!skb)
                                return;
-                       }
                } else
                        skb_orphan(skb);
 
@@ -324,7 +321,7 @@ void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev, int idx)
        } else {
                /* locking problem with netif_stop_queue() ?? */
                printk(KERN_ERR "%s: %s: BUG! echo_skb is occupied!\n",
-                      dev->name, __FUNCTION__);
+                      dev->name, __func__);
                kfree_skb(skb);
        }
 }
@@ -364,7 +361,8 @@ int can_restart_now(struct net_device *dev)
 
        can_flush_echo_skb(dev);
 
-       if ((err = priv->do_set_mode(dev, CAN_MODE_START)))
+       err = priv->do_set_mode(dev, CAN_MODE_START);
+       if (err)
                return err;
 
        netif_carrier_on(dev);

diff --git a/kernel/2.6/include/linux/can/dev.h b/kernel/2.6/include/linux/can/dev.h
index 24d3394e5335843b31f320a3e03ffcc38210efe7..33c747fbf8a806a9305c131b40a637e7f933a578 100644 (file)
--- a/kernel/2.6/include/linux/can/dev.h
+++ b/kernel/2.6/include/linux/can/dev.h
@@ -57,12 +57,12 @@ struct can_priv {
 
        struct sk_buff *echo_skb[CAN_ECHO_SKB_MAX];
 
-       int (*do_set_bittime)(struct net_device * dev,
-                             struct can_bittime * br);
-       int (*do_get_state)(struct net_device * dev, u32* state);
-       int (*do_set_mode)(struct net_device * dev, u32 mode);
-       int (*do_set_ctrlmode)(struct net_device * dev, u32 ctrlmode);
-       int (*do_get_ctrlmode)(struct net_device * dev, u32* ctrlmode);
+       int (*do_set_bittime)(struct net_device *dev,
+                             struct can_bittime *br);
+       int (*do_get_state)(struct net_device *dev, u32 *state);
+       int (*do_set_mode)(struct net_device *dev, u32 mode);
+       int (*do_set_ctrlmode)(struct net_device *dev, u32 ctrlmode);
+       int (*do_get_ctrlmode)(struct net_device *dev, u32*ctrlmode);
 };
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,21)