aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/et131x
diff options
context:
space:
mode:
authorToshiaki Yamane <yamanetoshi@gmail.com>2012-07-19 10:34:32 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-19 16:01:30 -0700
commite58b89dade3e9e7577f8481b21af3043dc0fffe3 (patch)
treea59b5ee5e60a5a66c58abb067d39b4787976dc69 /drivers/staging/et131x
parentstaging: sbe-2t3e3: Remove code that will never execute (diff)
downloadlinux-dev-e58b89dade3e9e7577f8481b21af3043dc0fffe3.tar.xz
linux-dev-e58b89dade3e9e7577f8481b21af3043dc0fffe3.zip
staging/et131x: fix checkpatch warnings
The below checkpatch warns was fixed, drivers/staging/et131x/et131x.c:2556: WARNING: Prefer pr_info(... to printk(KERN_INFO, ... drivers/staging/et131x/et131x.c:2577: WARNING: Prefer pr_info(... to printk(KERN_INFO, ... drivers/staging/et131x/et131x.c:5189: WARNING: Prefer pr_info(... to printk(KERN_INFO, ... And fixed below, -added pr_fmt -fixed printk formats for dma_addr_t -converted printk to netdev_info Signed-off-by: Toshiaki Yamane <yamanetoshi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/et131x')
-rw-r--r--drivers/staging/et131x/et131x.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 4c78f12ddc34..029725c89e58 100644
--- 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
@@ -5180,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);