Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-17 09:31:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

drivers/net/vxge/vxge-main.c: Use pr_<level> and netdev_<level>

Browse Source 
Use pr_fmt, pr_<level> and netdev_<level> where appropriate.

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches 2010-07-27 11:47:03 +00:00 committed by David S. Miller
parent 19de1e389b
commit 75f5e1c6f6
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/vxge/vxge-main.c
View File

@ -41,6 +41,8 @@
* *
******************************************************************************/ ******************************************************************************/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/if_vlan.h> #include <linux/if_vlan.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -144,7 +146,7 @@ vxge_callback_link_up(struct __vxge_hw_device *hldev)
vxge_debug_entryexit(VXGE_TRACE, "%s: %s:%d", vxge_debug_entryexit(VXGE_TRACE, "%s: %s:%d",
vdev->ndev->name, __func__, __LINE__); vdev->ndev->name, __func__, __LINE__);
printk(KERN_NOTICE "%s: Link Up\n", vdev->ndev->name); netdev_notice(vdev->ndev, "Link Up\n");
vdev->stats.link_up++; vdev->stats.link_up++;
netif_carrier_on(vdev->ndev); netif_carrier_on(vdev->ndev);
@ -168,7 +170,7 @@ vxge_callback_link_down(struct __vxge_hw_device *hldev)
vxge_debug_entryexit(VXGE_TRACE, vxge_debug_entryexit(VXGE_TRACE,
"%s: %s:%d", vdev->ndev->name, __func__, __LINE__); "%s: %s:%d", vdev->ndev->name, __func__, __LINE__);
printk(KERN_NOTICE "%s: Link Down\n", vdev->ndev->name); netdev_notice(vdev->ndev, "Link Down\n");
vdev->stats.link_down++; vdev->stats.link_down++;
netif_carrier_off(vdev->ndev); netif_carrier_off(vdev->ndev);
@ -2679,7 +2681,7 @@ vxge_open(struct net_device *dev)
if (vxge_hw_device_link_state_get(vdev->devh) == VXGE_HW_LINK_UP) { if (vxge_hw_device_link_state_get(vdev->devh) == VXGE_HW_LINK_UP) {
netif_carrier_on(vdev->ndev); netif_carrier_on(vdev->ndev);
printk(KERN_NOTICE "%s: Link Up\n", vdev->ndev->name); netdev_notice(vdev->ndev, "Link Up\n");
vdev->stats.link_up++; vdev->stats.link_up++;
} }
@ -2817,7 +2819,7 @@ int do_vxge_close(struct net_device *dev, int do_io)
} }
netif_carrier_off(vdev->ndev); netif_carrier_off(vdev->ndev);
printk(KERN_NOTICE "%s: Link Down\n", vdev->ndev->name); netdev_notice(vdev->ndev, "Link Down\n");
netif_tx_stop_all_queues(vdev->ndev); netif_tx_stop_all_queues(vdev->ndev);
/* Note that at this point xmit() is stopped by upper layer */ /* Note that at this point xmit() is stopped by upper layer */
@ -3844,9 +3846,7 @@ static pci_ers_result_t vxge_io_slot_reset(struct pci_dev *pdev)
struct vxgedev *vdev = netdev_priv(netdev); struct vxgedev *vdev = netdev_priv(netdev);
if (pci_enable_device(pdev)) { if (pci_enable_device(pdev)) {
printk(KERN_ERR "%s: " netdev_err(netdev, "Cannot re-enable device after reset\n");
"Cannot re-enable device after reset\n",
VXGE_DRIVER_NAME);
return PCI_ERS_RESULT_DISCONNECT; return PCI_ERS_RESULT_DISCONNECT;
} }
@ -3871,9 +3871,8 @@ static void vxge_io_resume(struct pci_dev *pdev)
if (netif_running(netdev)) { if (netif_running(netdev)) {
if (vxge_open(netdev)) { if (vxge_open(netdev)) {
printk(KERN_ERR "%s: " netdev_err(netdev,
"Can't bring device back up after reset\n", "Can't bring device back up after reset\n");
VXGE_DRIVER_NAME);
return; return;
} }
} }
@ -4430,13 +4429,9 @@ static int __init
vxge_starter(void) vxge_starter(void)
{ {
int ret = 0; int ret = 0;
char version[32];
snprintf(version, 32, "%s", DRV_VERSION);
printk(KERN_INFO "%s: Copyright(c) 2002-2010 Exar Corp.\n", pr_info("Copyright(c) 2002-2010 Exar Corp.\n");
VXGE_DRIVER_NAME); pr_info("Driver version: %s\n", DRV_VERSION);
printk(KERN_INFO "%s: Driver version: %s\n",
VXGE_DRIVER_NAME, version);
verify_bandwidth(); verify_bandwidth();