Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[~andy/linux] / drivers / staging / et131x / et131x.c

diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index ac6897b593c9200fec20c513c2a5020e0b73c6a2..029725c89e58a3e900e57b4d2e2e9e87ba376860 100644 (file)
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -53,6 +53,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -2553,8 +2555,8 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
                          "Cannot alloc memory for Packet Status Ring\n");
                return -ENOMEM;
        }
-       printk(KERN_INFO "Packet Status Ring %lx\n",
-           (unsigned long) rx_ring->ps_ring_physaddr);
+       pr_info("Packet Status Ring %llx\n",
+               (unsigned long long) rx_ring->ps_ring_physaddr);
 
        /*
         * NOTE : dma_alloc_coherent(), used above to alloc DMA regions,
@@ -2574,7 +2576,7 @@ static int et131x_rx_dma_memory_alloc(struct et131x_adapter *adapter)
                return -ENOMEM;
        }
        rx_ring->num_rfd = NIC_DEFAULT_NUM_RFD;
-       printk(KERN_INFO "PRS %lx\n", (unsigned long)rx_ring->rx_status_bus);
+       pr_info("PRS %llx\n", (unsigned long long)rx_ring->rx_status_bus);
 
        /* Recv
         * kmem_cache_create initializes a lookaside list. After successful
@@ -3943,12 +3945,6 @@ static struct ethtool_ops et131x_ethtool_ops = {
        .get_regs       = et131x_get_regs,
        .get_link = ethtool_op_get_link,
 };
-
-static void et131x_set_ethtool_ops(struct net_device *netdev)
-{
-       SET_ETHTOOL_OPS(netdev, &et131x_ethtool_ops);
-}
-
 /**
  * et131x_hwaddr_init - set up the MAC Address on the ET1310
  * @adapter: pointer to our private adapter structure
@@ -5186,8 +5182,8 @@ static int et131x_set_mac_addr(struct net_device *netdev, void *new_mac)
 
        memcpy(netdev->dev_addr, address->sa_data, netdev->addr_len);
 
-       printk(KERN_INFO "%s: Setting MAC address to %pM\n",
-                       netdev->name, netdev->dev_addr);
+       netdev_info(netdev, "Setting MAC address to %pM\n",
+                   netdev->dev_addr);
 
        /* Free Rx DMA memory */
        et131x_adapter_memory_free(adapter);
@@ -5301,7 +5297,7 @@ static int __devinit et131x_pci_setup(struct pci_dev *pdev,
        netdev->netdev_ops     = &et131x_netdev_ops;
 
        SET_NETDEV_DEV(netdev, &pdev->dev);
-       et131x_set_ethtool_ops(netdev);
+       SET_ETHTOOL_OPS(netdev, &et131x_ethtool_ops);
 
        adapter = et131x_adapter_init(netdev, pdev);