Staging: arlan: fixed unnecessary whitespace style issue in arlan-main.c

This is a patch to the arlan-main.c file that fixes the unnecessary whitespace
issues found by the checkpatch.pl tool.

Signed-off-by: Prashant P. Shah <pshah.mumbai@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/arlan/arlan-main.c b/drivers/staging/arlan/arlan-main.c
index 58deb96e1a37fab109f6db36a7019bb08e94326b..301b979d0437c840f6b5587e75667757aee5b886 100644 (file)
--- a/drivers/staging/arlan/arlan-main.c
+++ b/drivers/staging/arlan/arlan-main.c
@@ -76,18 +76,18 @@ MODULE_PARM_DESC(entry_and_exit_debug, "Arlan driver function entry and exit deb
 struct arlan_conf_stru arlan_conf[MAX_ARLANS];
 static int arlans_found;
 
-static  int    arlan_open(struct net_device *dev);
-static  netdev_tx_t arlan_tx(struct sk_buff *skb, struct net_device *dev);
-static  irqreturn_t arlan_interrupt(int irq, void *dev_id);
-static  int    arlan_close(struct net_device *dev);
-static  struct net_device_stats *arlan_statistics(struct net_device *dev);
-static  void   arlan_set_multicast(struct net_device *dev);
-static  int    arlan_hw_tx(struct net_device *dev, char *buf, int length);
-static  int    arlan_hw_config(struct net_device *dev);
-static  void   arlan_tx_done_interrupt(struct net_device *dev, int status);
-static  void   arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short, u_short);
-static  void   arlan_process_interrupt(struct net_device *dev);
-static void    arlan_tx_timeout(struct net_device *dev);
+static int     arlan_open(struct net_device *dev);
+static netdev_tx_t arlan_tx(struct sk_buff *skb, struct net_device *dev);
+static irqreturn_t arlan_interrupt(int irq, void *dev_id);
+static int     arlan_close(struct net_device *dev);
+static struct net_device_stats *arlan_statistics(struct net_device *dev);
+static void    arlan_set_multicast(struct net_device *dev);
+static int     arlan_hw_tx(struct net_device *dev, char *buf, int length);
+static int     arlan_hw_config(struct net_device *dev);
+static void    arlan_tx_done_interrupt(struct net_device *dev, int status);
+static void    arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short, u_short);
+static void    arlan_process_interrupt(struct net_device *dev);
+static void    arlan_tx_timeout(struct net_device *dev);
 
 static inline long us2ticks(int us)
 {
@@ -155,7 +155,7 @@ int arlan_command(struct net_device *dev, int command_p)
                priv->card_polling_interval = 1;
 
        if (arlan_debug & ARLAN_DEBUG_CHAIN_LOCKS)
-               printk(KERN_DEBUG "arlan_command, %lx commandByte %x waiting %lx incoming %x \n",
+               printk(KERN_DEBUG "arlan_command, %lx commandByte %x waiting %lx incoming %x\n",
                jiffies, READSHMB(arlan->commandByte),
                       priv->waiting_command_mask, command_p);
 
@@ -193,13 +193,13 @@ int arlan_command(struct net_device *dev, int command_p)
 
                        if (priv->waiting_command_mask & ARLAN_COMMAND_LONG_WAIT_NOW) {
                                if (udelayed * 40 > 1000000) {
-                                       printk(KERN_ERR "%s long wait too long \n", dev->name);
+                                       printk(KERN_ERR "%s long wait too long\n", dev->name);
                                        priv->waiting_command_mask |= ARLAN_COMMAND_RESET;
                                        break;
                                }
                        } else if (priv->waiting_command_mask & ARLAN_COMMAND_WAIT_NOW) {
                                if (udelayed * 40 > 1000) {
-                                       printk(KERN_ERR "%s short wait too long \n", dev->name);
+                                       printk(KERN_ERR "%s short wait too long\n", dev->name);
                                        goto bad_end;
                                }
                        }
@@ -258,7 +258,7 @@ int arlan_command(struct net_device *dev, int command_p)
 
                arlan_drop_tx(dev);
                if (priv->tx_command_given || priv->rx_command_given)
-                       printk(KERN_ERR "%s: Reset under tx or rx command \n", dev->name);
+                       printk(KERN_ERR "%s: Reset under tx or rx command\n", dev->name);
 
                netif_stop_queue(dev);
                if (arlan_debug & ARLAN_DEBUG_RESET)
@@ -290,7 +290,7 @@ int arlan_command(struct net_device *dev, int command_p)
                priv->waiting_command_mask &= ~ARLAN_COMMAND_INT_RENABLE;
        } else if (priv->waiting_command_mask & ARLAN_COMMAND_CONF) {
                if (priv->tx_command_given || priv->rx_command_given)
-                       printk(KERN_ERR "%s: Reset under tx or rx command \n", dev->name);
+                       printk(KERN_ERR "%s: Reset under tx or rx command\n", dev->name);
 
                arlan_drop_tx(dev);
                setInterruptEnable(dev);
@@ -313,7 +313,7 @@ int arlan_command(struct net_device *dev, int command_p)
                } else {
                        priv->card_polling_interval = 1;
                        if (arlan_debug & ARLAN_DEBUG_TIMING)
-                               printk(KERN_ERR "configure delayed \n");
+                               printk(KERN_ERR "configure delayed\n");
                }
        } else if (priv->waiting_command_mask & ARLAN_COMMAND_RX) {
                if (!registrationBad(dev)) {
@@ -354,7 +354,7 @@ int arlan_command(struct net_device *dev, int command_p)
                                priv->card_polling_interval = 1;
                        }
                } else if (arlan_debug & ARLAN_DEBUG_CHAIN_LOCKS)
-                       printk(KERN_ERR "tx command when tx chain locked \n");
+                       printk(KERN_ERR "tx command when tx chain locked\n");
        } else if (priv->waiting_command_mask & ARLAN_COMMAND_NOOPINT) {
                {
                        WRITESHMB(arlan->commandByte, ARLAN_COM_NOP | ARLAN_COM_INT);
@@ -396,13 +396,13 @@ card_busy_end:
                priv->waiting_command_mask |= ARLAN_COMMAND_CLEAN_AND_RESET;
 
        if (arlan_debug & ARLAN_DEBUG_CARD_STATE)
-               printk(KERN_ERR "%s arlan_command card busy end \n", dev->name);
+               printk(KERN_ERR "%s arlan_command card busy end\n", dev->name);
        spin_unlock_irqrestore(&priv->lock, flags);
        ARLAN_DEBUG_EXIT("arlan_command");
        return 1;
 
 bad_end:
-       printk(KERN_ERR "%s arlan_command bad end \n", dev->name);
+       printk(KERN_ERR "%s arlan_command bad end\n", dev->name);
 
        spin_unlock_irqrestore(&priv->lock, flags);
        ARLAN_DEBUG_EXIT("arlan_command");
@@ -438,9 +438,9 @@ static inline void arlan_retransmit_now(struct net_device *dev)
        if (TXLAST(dev).offset == 0) {
                if (TXHEAD(dev).offset) {
                        priv->txLast = 0;
-                       IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk(KERN_DEBUG "TX buff switch to head \n");
+                       IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk(KERN_DEBUG "TX buff switch to head\n");
                } else if (TXTAIL(dev).offset) {
-                       IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk(KERN_DEBUG "TX buff switch to tail \n");
+                       IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk(KERN_DEBUG "TX buff switch to tail\n");
                        priv->txLast = 1;
                } else
                        IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk(KERN_ERR "ReTransmit buff empty");
@@ -452,7 +452,7 @@ static inline void arlan_retransmit_now(struct net_device *dev)
        priv->Conf->driverRetransmissions++;
        priv->retransmissions++;
 
-       IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk("Retransmit %d bytes \n", TXLAST(dev).length);
+       IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk("Retransmit %d bytes\n", TXLAST(dev).length);
 
        ARLAN_DEBUG_EXIT("arlan_retransmit_now");
 }
@@ -471,7 +471,7 @@ static void arlan_registration_timer(unsigned long data)
        if (registrationBad(dev)) {
                priv->registrationLostCount++;
                if (lostTime > 7000 && lostTime < 7200)
-                       printk(KERN_NOTICE "%s registration Lost \n", dev->name);
+                       printk(KERN_NOTICE "%s registration Lost\n", dev->name);
 
                if (lostTime / priv->reRegisterExp > 2000)
                        arlan_command(dev, ARLAN_COMMAND_CLEAN_AND_CONF);
@@ -504,7 +504,7 @@ static void arlan_registration_timer(unsigned long data)
 
        if (!registrationBad(dev) && priv->ReTransmitRequested) {
                IFDEBUG(ARLAN_DEBUG_TX_CHAIN)
-                       printk(KERN_ERR "Retransmit from timer \n");
+                       printk(KERN_ERR "Retransmit from timer\n");
                priv->ReTransmitRequested = 0;
                arlan_retransmit_now(dev);
        }
@@ -650,7 +650,7 @@ static int arlan_hw_tx(struct net_device *dev, char *buf, int length)
                netif_start_queue(dev);
 
        IFDEBUG(ARLAN_DEBUG_HEADER_DUMP)
-               printk(KERN_WARNING "%s Transmit t %2x:%2x:%2x:%2x:%2x:%2x f %2x:%2x:%2x:%2x:%2x:%2x \n", dev->name,
+               printk(KERN_WARNING "%s Transmit t %2x:%2x:%2x:%2x:%2x:%2x f %2x:%2x:%2x:%2x:%2x:%2x\n", dev->name,
                   (unsigned char) buf[0], (unsigned char) buf[1], (unsigned char) buf[2], (unsigned char) buf[3],
                   (unsigned char) buf[4], (unsigned char) buf[5], (unsigned char) buf[6], (unsigned char) buf[7],
                   (unsigned char) buf[8], (unsigned char) buf[9], (unsigned char) buf[10], (unsigned char) buf[11]);
@@ -661,7 +661,7 @@ static int arlan_hw_tx(struct net_device *dev, char *buf, int length)
 
        priv->tx_last_sent = jiffies;
 
-       IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk("%s TX Qued %d bytes \n", dev->name, length);
+       IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk("%s TX Qued %d bytes\n", dev->name, length);
 
        ARLAN_DEBUG_EXIT("arlan_hw_tx");
 
@@ -677,9 +677,9 @@ static int arlan_hw_config(struct net_device *dev)
 
        ARLAN_DEBUG_ENTRY("arlan_hw_config");
 
-       printk(KERN_NOTICE "%s arlan configure called \n", dev->name);
+       printk(KERN_NOTICE "%s arlan configure called\n", dev->name);
        if (arlan_EEPROM_bad)
-               printk(KERN_NOTICE "arlan configure with eeprom bad option \n");
+               printk(KERN_NOTICE "arlan configure with eeprom bad option\n");
 
 
        WRITESHM(arlan->spreadingCode, conf->spreadingCode, u_char);
@@ -841,7 +841,7 @@ static int arlan_read_card_configuration(struct net_device *dev)
        READSHM(tlx415, arlan->configStatus, u_char);
 
        if (tlx415 != 0xA5)
-               printk(KERN_INFO "%s tlx415 chip \n", dev->name);
+               printk(KERN_INFO "%s tlx415 chip\n", dev->name);
 
        conf->txClear = 0;
        conf->txRetries = 1;
@@ -885,7 +885,7 @@ static int __init arlan_check_fingerprint(unsigned long memaddr)
        ARLAN_DEBUG_ENTRY("arlan_check_fingerprint");
 
        if (!request_mem_region(paddr, ARLAN_SHMEM_SIZE, "arlan")) {
-               /* printk(KERN_WARNING "arlan: memory region %lx excluded from probing \n",paddr); */
+               /* printk(KERN_WARNING "arlan: memory region %lx excluded from probing\n",paddr); */
                return -ENODEV;
        }
 
@@ -898,7 +898,7 @@ static int __init arlan_check_fingerprint(unsigned long memaddr)
                return -ENODEV;
        }
 
-       /* printk(KERN_INFO "arlan found at 0x%x \n",memaddr); */
+       /* printk(KERN_INFO "arlan found at 0x%x\n",memaddr); */
        ARLAN_DEBUG_EXIT("arlan_check_fingerprint");
 
        return 0;
@@ -919,7 +919,7 @@ static int arlan_change_mtu(struct net_device *dev, int new_mtu)
        conf->maxFrameSize = new_mtu + 48;
 
        arlan_command(dev, ARLAN_COMMAND_CLEAN_AND_CONF);
-       printk(KERN_NOTICE "%s mtu changed to %d \n", dev->name, new_mtu);
+       printk(KERN_NOTICE "%s mtu changed to %d\n", dev->name, new_mtu);
 
        ARLAN_DEBUG_EXIT("arlan_change_mtu");
 
@@ -997,7 +997,7 @@ static int __init arlan_probe_here(struct net_device *dev,
        if (arlan_check_fingerprint(memaddr))
                return -ENODEV;
 
-       printk(KERN_NOTICE "%s: Arlan found at %llx, \n ", dev->name,
+       printk(KERN_NOTICE "%s: Arlan found at %llx,\n ", dev->name,
               (u64) virt_to_phys((void *)memaddr));
 
        ap->card = (void *) memaddr;
@@ -1090,7 +1090,7 @@ static netdev_tx_t arlan_tx(struct sk_buff *skb, struct net_device *dev)
        buf = skb->data;
 
        if (length + 0x12 > 0x800) {
-               printk(KERN_ERR "TX RING overflow \n");
+               printk(KERN_ERR "TX RING overflow\n");
                netif_stop_queue(dev);
        }
 
@@ -1313,7 +1313,7 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
        /* prohibited here              arlan_command(dev, ARLAN_COMMAND_RX); */
 
        if (pkt_len < 10 || pkt_len > 2048) {
-               printk(KERN_WARNING "%s: got too short or long packet, len %d \n", dev->name, pkt_len);
+               printk(KERN_WARNING "%s: got too short or long packet, len %d\n", dev->name, pkt_len);
                return;
        }
        if (rxOffset + pkt_len > 0x2000) {
@@ -1345,8 +1345,8 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                struct sk_buff *skb;
 
                DEBUGSHM(50, "arlan recv pkt offs=%d\n", arlan->rxOffset, u_short);
-               DEBUGSHM(1, "arlan rxFrmType = %d \n", arlan->rxFrmType, u_char);
-               DEBUGSHM(1, KERN_INFO "arlan rx scrambled = %d \n", arlan->scrambled, u_char);
+               DEBUGSHM(1, "arlan rxFrmType = %d\n", arlan->rxFrmType, u_char);
+               DEBUGSHM(1, KERN_INFO "arlan rx scrambled = %d\n", arlan->scrambled, u_char);
 
                /* here we do multicast filtering to avoid slow 8-bit memcopy */
 #ifdef ARLAN_MULTICAST
@@ -1361,9 +1361,9 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                        if (hw_dst_addr[0] == 0x01) {
                                if (mdebug)
                                        if (hw_dst_addr[1] == 0x00)
-                                               printk(KERN_ERR "%s mcast 0x0100 \n", dev->name);
+                                               printk(KERN_ERR "%s mcast 0x0100\n", dev->name);
                                        else if (hw_dst_addr[1] == 0x40)
-                                               printk(KERN_ERR "%s m/bcast 0x0140 \n", dev->name);
+                                               printk(KERN_ERR "%s m/bcast 0x0140\n", dev->name);
                                netdev_for_each_mc_entry(dmi, dev) {
                                        if (arlan_debug & ARLAN_DEBUG_HEADER_DUMP)
                                                printk(KERN_ERR "%s mcl %pM\n",
@@ -1417,7 +1417,7 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                                for (i = 0; i <= 22; i++)
                                        printk("%02x:", (u_char) skbtmp[i + 12]);
                                printk(KERN_ERR "\n");
-                               printk(KERN_WARNING "arlan kernel pkt type trans %x \n", skb->protocol);
+                               printk(KERN_WARNING "arlan kernel pkt type trans %x\n", skb->protocol);
                        }
                netif_rx(skb);
                dev->stats.rx_packets++;
@@ -1447,7 +1447,7 @@ static void arlan_process_interrupt(struct net_device *dev)
 
        if (test_and_set_bit(0, (void *) &priv->interrupt_processing_active)) {
                if (arlan_debug & ARLAN_DEBUG_CHAIN_LOCKS)
-                       printk(KERN_ERR "interrupt chain reentering \n");
+                       printk(KERN_ERR "interrupt chain reentering\n");
                goto end_int_process;
        }
        while ((rxStatus || txStatus || priv->interrupt_ack_requested)
@@ -1459,7 +1459,7 @@ static void arlan_process_interrupt(struct net_device *dev)
                arlan_command(dev, ARLAN_COMMAND_INT_ENABLE);
 
                IFDEBUG(ARLAN_DEBUG_INTERRUPT)
-                       printk(KERN_ERR "%s:  got IRQ rx %x tx %x comm %x rxOff %x rxLen %x \n",
+                       printk(KERN_ERR "%s:  got IRQ rx %x tx %x comm %x rxOff %x rxLen %x\n",
                                        dev->name, rxStatus, txStatus, READSHMB(arlan->commandByte),
                                        rxOffset, pkt_len);
 
@@ -1470,7 +1470,7 @@ static void arlan_process_interrupt(struct net_device *dev)
                                                                                    dev->name, txStatus, rxStatus);
                        } else {
                                IFDEBUG(ARLAN_DEBUG_INTERRUPT)
-                                       printk(KERN_INFO "%s irq $%d test OK \n", dev->name, dev->irq);
+                                       printk(KERN_INFO "%s irq $%d test OK\n", dev->name, dev->irq);
 
                        }
                        priv->interrupt_ack_requested = 0;
@@ -1693,7 +1693,7 @@ struct net_device * __init arlan_probe(int unit)
        }
 
        if (lastFoundAt == 0xbe000)
-               printk(KERN_ERR "arlan: No Arlan devices found \n");
+               printk(KERN_ERR "arlan: No Arlan devices found\n");
 
  not_found:
        free_netdev(dev);