1 files changed, 20 insertions, 14 deletions

diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 142c381e1d73..0a00850da79d 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -200,7 +200,7 @@ struct r6040_private {
         int old_duplex;
 };
 
-static char version[] __devinitdata = KERN_INFO DRV_NAME
+static char version[] __devinitdata = DRV_NAME
         ": RDC R6040 NAPI net driver,"
         "version "DRV_VERSION " (" DRV_RELDATE ")";
 
@@ -224,7 +224,8 @@ static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg)
 }
 
 /* Write a word data from PHY Chip */
-static void r6040_phy_write(void __iomem *ioaddr, int phy_addr, int reg, u16 val)
+static void r6040_phy_write(void __iomem *ioaddr,
+                                        int phy_addr, int reg, u16 val)
 {
         int limit = 2048;
         u16 cmd;
@@ -348,8 +349,8 @@ static int r6040_alloc_rxbufs(struct net_device *dev)
                 }
                 desc->skb_ptr = skb;
                 desc->buf = cpu_to_le32(pci_map_single(lp->pdev,
-                                                desc->skb_ptr->data,
-                                                MAX_BUF_SIZE, PCI_DMA_FROMDEVICE));
+                                        desc->skb_ptr->data,
+                                        MAX_BUF_SIZE, PCI_DMA_FROMDEVICE));
                 desc->status = DSC_OWNER_MAC;
                 desc = desc->vndescp;
         } while (desc != lp->rx_ring);
@@ -491,12 +492,14 @@ static int r6040_close(struct net_device *dev)
 
         /* Free Descriptor memory */
         if (lp->rx_ring) {
-                pci_free_consistent(pdev, RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma);
+                pci_free_consistent(pdev,
+                                RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma);
                 lp->rx_ring = NULL;
         }
 
         if (lp->tx_ring) {
-                pci_free_consistent(pdev, TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma);
+                pci_free_consistent(pdev,
+                                TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma);
                 lp->tx_ring = NULL;
         }
 
@@ -547,7 +550,7 @@ static int r6040_rx(struct net_device *dev, int limit)
                         }
                         goto next_descr;
                 }
-                
+
                 /* Packet successfully received */
                 new_skb = netdev_alloc_skb(dev, MAX_BUF_SIZE);
                 if (!new_skb) {
@@ -556,13 +559,13 @@ static int r6040_rx(struct net_device *dev, int limit)
                 }
                 skb_ptr = descptr->skb_ptr;
                 skb_ptr->dev = priv->dev;
-                
+
                 /* Do not count the CRC */
                 skb_put(skb_ptr, descptr->len - 4);
                 pci_unmap_single(priv->pdev, le32_to_cpu(descptr->buf),
                                         MAX_BUF_SIZE, PCI_DMA_FROMDEVICE);
                 skb_ptr->protocol = eth_type_trans(skb_ptr, priv->dev);
-                
+
                 /* Send to upper layer */
                 netif_receive_skb(skb_ptr);
                 dev->stats.rx_packets++;
@@ -710,8 +713,10 @@ static int r6040_up(struct net_device *dev)
                 return ret;
 
         /* improve performance (by RDC guys) */
-        r6040_phy_write(ioaddr, 30, 17, (r6040_phy_read(ioaddr, 30, 17) | 0x4000));
-        r6040_phy_write(ioaddr, 30, 17, ~((~r6040_phy_read(ioaddr, 30, 17)) | 0x2000));
+        r6040_phy_write(ioaddr, 30, 17,
+                        (r6040_phy_read(ioaddr, 30, 17) | 0x4000));
+        r6040_phy_write(ioaddr, 30, 17,
+                        ~((~r6040_phy_read(ioaddr, 30, 17)) | 0x2000));
         r6040_phy_write(ioaddr, 0, 19, 0x0000);
         r6040_phy_write(ioaddr, 0, 30, 0x01F0);
 
@@ -946,7 +951,7 @@ static const struct net_device_ops r6040_netdev_ops = {
         .ndo_set_multicast_list = r6040_multicast_list,
         .ndo_change_mtu         = eth_change_mtu,
         .ndo_validate_addr      = eth_validate_addr,
-        .ndo_set_mac_address    = eth_mac_addr,
+        .ndo_set_mac_address    = eth_mac_addr,
         .ndo_do_ioctl           = r6040_ioctl,
         .ndo_tx_timeout         = r6040_tx_timeout,
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -1039,7 +1044,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         u16 *adrp;
         int i;
 
-        printk("%s\n", version);
+        pr_info("%s\n", version);
 
         err = pci_enable_device(pdev);
         if (err)
@@ -1113,7 +1118,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
         /* Some bootloader/BIOSes do not initialize
          * MAC address, warn about that */
         if (!(adrp[0] || adrp[1] || adrp[2])) {
-                netdev_warn(dev, "MAC address not initialized, generating random\n");
+                netdev_warn(dev, "MAC address not initialized, "
+                                        "generating random\n");
                 random_ether_addr(dev->dev_addr);
         }