MSCAN: further cleanup, remove volatile and whitespace

Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
git-svn-id: svn://svn.berlios.de//socketcan/trunk@945 030b6a49-0b11-0410-94ab-b0dab22257f2

diff --git a/kernel/2.6/drivers/net/can/Makefile b/kernel/2.6/drivers/net/can/Makefile
index 7282c7ee2c6d19d00d3f105be0f514da92524285..7d1f44d25f738baeeb484bf3d15af0780f1ba851 100644 (file)
--- a/kernel/2.6/drivers/net/can/Makefile
+++ b/kernel/2.6/drivers/net/can/Makefile
@@ -44,8 +44,6 @@ obj-$(CONFIG_CAN_MSCAN_OLD)   += old/mscan/
 obj-$(CONFIG_CAN_CCAN_OLD)     += old/ccan/
 obj-$(CONFIG_CAN_MCP251X)      += mcp251x.o
 
-ifeq ($(CONFIG_CAN_DEBUG_DEVICES),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
 
 endif

diff --git a/kernel/2.6/drivers/net/can/mscan/Makefile b/kernel/2.6/drivers/net/can/mscan/Makefile
index 26f5e9bda3647ca2b84b40110b048f224bd335a9..1f7dbfb1ef1b31f12bbe424b2e97c577b227b7cd 100644 (file)
--- a/kernel/2.6/drivers/net/can/mscan/Makefile
+++ b/kernel/2.6/drivers/net/can/mscan/Makefile
@@ -19,8 +19,6 @@ obj-$(CONFIG_CAN_MPC52XX)     += mscan-mpc52xx.o
 
 mscan-mpc52xx-objs     := mscan.o mpc52xx_can.o
 
-ifeq ($(CONFIG_CAN_DEBUG_DEVICES),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
 
 endif

diff --git a/kernel/2.6/drivers/net/can/mscan/mpc52xx_can.c b/kernel/2.6/drivers/net/can/mscan/mpc52xx_can.c
index b8c022947142f9d0235381572e26567a6ef9b608..21cef77aa6199483be9aa0fb2492a3abf75afe4c 100644 (file)
--- a/kernel/2.6/drivers/net/can/mscan/mpc52xx_can.c
+++ b/kernel/2.6/drivers/net/can/mscan/mpc52xx_can.c
@@ -273,7 +273,7 @@ static unsigned int  __devinit mpc52xx_can_xtal_freq(struct device_node *np)
        if (!freq)
                return 0;
 
-               /*
+       /*
         * Detemine SYS_XTAL_IN frequency from the clock domain settings
         */
        np_cdm = of_find_matching_node(NULL, mpc52xx_cdm_ids);

diff --git a/kernel/2.6/drivers/net/can/mscan/mscan.c b/kernel/2.6/drivers/net/can/mscan/mscan.c
index 4c2b46dcbe9e085982324ae9506d8b78ceacaa40..829cde03f54211d41f6fa347fe6a92892233f797 100644 (file)
--- a/kernel/2.6/drivers/net/can/mscan/mscan.c
+++ b/kernel/2.6/drivers/net/can/mscan/mscan.c
@@ -93,7 +93,7 @@ struct tx_queue_entry {
 struct mscan_priv {
        struct can_priv can;
        long open_time;
-       volatile unsigned long flags;
+       unsigned long flags;
        u8 shadow_statflg;
        u8 shadow_canrier;
        u8 cur_pri;
@@ -272,7 +272,7 @@ static int mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
        out_be16(&regs->tx.idr1_0, can_id);
 
        if (!rtr) {
-               volatile void __iomem *data = &regs->tx.dsr1_0;
+               void __iomem *data = &regs->tx.dsr1_0;
                u16 *payload = (u16 *) frame->data;
                /*Its safe to write into dsr[dlc+1] */
                for (i = 0; i < (frame->can_dlc + 1) / 2; i++) {
@@ -384,7 +384,7 @@ static int mscan_rx_poll(struct net_device *dev, int *budget)
                        frame->can_dlc = in_8(&regs->rx.dlr) & 0xf;
 
                        if (!(frame->can_id & CAN_RTR_FLAG)) {
-                               volatile void __iomem *data = &regs->rx.dsr1_0;
+                               void __iomem *data = &regs->rx.dsr1_0;
                                u16 *payload = (u16 *) frame->data;
                                for (i = 0; i < (frame->can_dlc + 1) / 2; i++) {
                                        *payload++ = in_be16(data);

diff --git a/kernel/2.6/drivers/net/can/sja1000/Makefile b/kernel/2.6/drivers/net/can/sja1000/Makefile
index 0998de7b9b082504f4109457268b4f96de93e8f5..533445588ff17640d17b38fe8fdb8ad1f9f1025d 100644 (file)
--- a/kernel/2.6/drivers/net/can/sja1000/Makefile
+++ b/kernel/2.6/drivers/net/can/sja1000/Makefile
@@ -25,8 +25,6 @@ obj-$(CONFIG_CAN_PEAK_PCI) += peak_pci.o
 obj-$(CONFIG_CAN_PIPCAN) += pipcan.o
 obj-$(CONFIG_CAN_KVASER_PCI) += kvaser_pci.o
 
-ifeq ($(CONFIG_CAN_DEBUG_DEVICES),y)
-EXTRA_CFLAGS += -DDEBUG
-endif
+ccflags-$(CONFIG_CAN_DEBUG_DEVICES) := -DDEBUG
 
 endif