explicitly initialize init() functions in bcm.c.

removed and commented out unnecessary -I include options in Makefiles.
white-space clean up.

git-svn-id: svn://svn.berlios.de//socketcan/trunk@87 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/Makefile b/kernel/2.6/drivers/net/can/Makefile
index ca6497e00ed85c6ea3c48b38a73dd34d35562d7c..2501d78d71c04fd045b7367fb42fb01fadaf0d10 100644 (file)
--- a/kernel/2.6/drivers/net/can/Makefile
+++ b/kernel/2.6/drivers/net/can/Makefile
@@ -26,7 +26,7 @@ clean:
 
 else
 
-CPPFLAGS       += -Idrivers/net -Inet -I/home/ethuerm/src/socketcan/trunk/kernel/2.6/include
+#CPPFLAGS      += -Idrivers/net -Inet
 #AFLAGS                += -Idrivers/net -Inet
 #CFLAGS                += -Idrivers/net -Inet
 

diff --git a/kernel/2.6/drivers/net/can/sja1000/Makefile b/kernel/2.6/drivers/net/can/sja1000/Makefile
index d162ccab2177e942a82983012080cc7150567eb5..8691287f3dd8ffcaf3684665f358fd664be8e0ba 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/Makefile
+++ b/kernel/2.6/drivers/net/can/sja1000/Makefile
@@ -54,8 +54,7 @@ clean:
 else
 
 ifneq ($(KBUILD_EXTMOD),)
-EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)
-EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../../../include
+EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../../include
 endif
 
 obj-m := sja1000-isa.o sja1000-gw2.o sja1000-mem.o

diff --git a/kernel/2.6/net/can/Makefile b/kernel/2.6/net/can/Makefile
index 90c9b724715c7627cb3006154be9aa4f1c0c699d..87dfad3004ccc572e96286dda084439828abe988 100644 (file)
--- a/kernel/2.6/net/can/Makefile
+++ b/kernel/2.6/net/can/Makefile
@@ -66,7 +66,6 @@ clean:
 else
 
 ifneq ($(KBUILD_EXTMOD),)
-EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)
 EXTRA_CFLAGS += -I$(KBUILD_EXTMOD)/../../include
 endif
 

diff --git a/kernel/2.6/net/can/af_can.c b/kernel/2.6/net/can/af_can.c
index fabd39e19930a4ba0948e607477b0ce4bc921d50..4ba5ddddc3ac2df659f1b814991f3ab4808fdf9c 100644 (file)
--- a/kernel/2.6/net/can/af_can.c
+++ b/kernel/2.6/net/can/af_can.c
@@ -127,7 +127,7 @@ static rwlock_t notifier_lock = RW_LOCK_UNLOCKED;
 
 HLIST_HEAD(rx_dev_list);
 struct dev_rcv_lists rx_alldev_list;
-static spinlock_t rcv_lists_lock  = SPIN_LOCK_UNLOCKED;
+static spinlock_t rcv_lists_lock = SPIN_LOCK_UNLOCKED;
 
 static kmem_cache_t *rcv_cache;
 
@@ -397,7 +397,7 @@ static int can_notifier(struct notifier_block *nb,
                        return NOTIFY_DONE;
                }
                /* N.B. zeroing the struct is the correct initialization
-                       for the embedded hlist_head structs.
+                       for the embedded hlist_head structs.
                        Another list type, e.g. list_head, would require
                        explicit initialization. */
                memset(d, 0, sizeof(*d));

diff --git a/kernel/2.6/net/can/bcm.c b/kernel/2.6/net/can/bcm.c
index 5fbe8b7a33e02c9426db1b2c96be9fed1727f8b0..74618c3b01b939ef1258cd4748416bff8b6309c6 100644 (file)
--- a/kernel/2.6/net/can/bcm.c
+++ b/kernel/2.6/net/can/bcm.c
@@ -187,6 +187,7 @@ static struct proto bcm_proto = {
        .name       = "CAN_BCM",
        .owner      = THIS_MODULE,
        .obj_size   = sizeof(struct bcm_sock),
+       .init       = NULL,
 };
 
 static struct can_proto bcm_can_proto = {
@@ -208,6 +209,7 @@ static struct can_proto bcm_can_proto = {
        .ops        = &bcm_ops,
        .owner      = THIS_MODULE,
        .obj_size   = 0,
+       .init       = NULL,
 };
 
 #endif
@@ -414,7 +416,7 @@ static int bcm_read_proc(char *page, char **start, off_t off,
                        /* mark output cut off */
                        len += snprintf(page + len, PAGE_SIZE - len, "(..)\n");
                        break;
-               } 
+               }
        }
 
        list_for_each_entry(op, &ud->tx_ops, list) {