drivers/net/vxge/vxge-main.c: Use pr_<level> and netdev_<level>
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:
parent
19de1e389b
commit
75f5e1c6f6
|
@ -41,6 +41,8 @@
|
|||
*
|
||||
******************************************************************************/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
|
||||
#include <linux/if_vlan.h>
|
||||
#include <linux/pci.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",
|
||||
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++;
|
||||
|
||||
netif_carrier_on(vdev->ndev);
|
||||
|
@ -168,7 +170,7 @@ vxge_callback_link_down(struct __vxge_hw_device *hldev)
|
|||
|
||||
vxge_debug_entryexit(VXGE_TRACE,
|
||||
"%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++;
|
||||
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) {
|
||||
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++;
|
||||
}
|
||||
|
||||
|
@ -2817,7 +2819,7 @@ int do_vxge_close(struct net_device *dev, int do_io)
|
|||
}
|
||||
|
||||
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);
|
||||
|
||||
/* 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);
|
||||
|
||||
if (pci_enable_device(pdev)) {
|
||||
printk(KERN_ERR "%s: "
|
||||
"Cannot re-enable device after reset\n",
|
||||
VXGE_DRIVER_NAME);
|
||||
netdev_err(netdev, "Cannot re-enable device after reset\n");
|
||||
return PCI_ERS_RESULT_DISCONNECT;
|
||||
}
|
||||
|
||||
|
@ -3871,9 +3871,8 @@ static void vxge_io_resume(struct pci_dev *pdev)
|
|||
|
||||
if (netif_running(netdev)) {
|
||||
if (vxge_open(netdev)) {
|
||||
printk(KERN_ERR "%s: "
|
||||
"Can't bring device back up after reset\n",
|
||||
VXGE_DRIVER_NAME);
|
||||
netdev_err(netdev,
|
||||
"Can't bring device back up after reset\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -4430,13 +4429,9 @@ static int __init
|
|||
vxge_starter(void)
|
||||
{
|
||||
int ret = 0;
|
||||
char version[32];
|
||||
snprintf(version, 32, "%s", DRV_VERSION);
|
||||
|
||||
printk(KERN_INFO "%s: Copyright(c) 2002-2010 Exar Corp.\n",
|
||||
VXGE_DRIVER_NAME);
|
||||
printk(KERN_INFO "%s: Driver version: %s\n",
|
||||
VXGE_DRIVER_NAME, version);
|
||||
pr_info("Copyright(c) 2002-2010 Exar Corp.\n");
|
||||
pr_info("Driver version: %s\n", DRV_VERSION);
|
||||
|
||||
verify_bandwidth();
|
||||
|
||||
|
|
Loading…
Reference in a new issue