Commit a7a79deb authored by Vasanthy Kolluri's avatar Vasanthy Kolluri Committed by David S. Miller
Browse files

enic: Use (netdev|dev|pr)_<level> macro helpers for logging 



Replace all printk routines with the (netdev|dev|pr)_<level> macros that
provide verbose logs.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarScott Feldman <scofeldm@cisco.com>
Signed-off-by: default avatarVasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 383ab92f

drivers/net/enic/enic.h

+5 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#define DRV_DESCRIPTION		"Cisco VIC Ethernet NIC Driver"

#define DRV_VERSION		"1.4.1.1"

#define DRV_COPYRIGHT		"Copyright 2008-2009 Cisco Systems, Inc"

#define PFX			DRV_NAME ": "



#define ENIC_BARS_MAX		6
@@ -130,4 +129,9 @@ struct enic { 
	unsigned int cq_count;

};



static inline struct device *enic_get_dev(struct enic *enic)

{

	return &(enic->pdev->dev);

}



#endif /* _ENIC_H_ */

drivers/net/enic/enic_main.c

+55 −70
Original line number Diff line number Diff line
@@ -418,15 +418,15 @@ static void enic_log_q_error(struct enic *enic) 
	for (i = 0; i < enic->wq_count; i++) {

		error_status = vnic_wq_error_status(&enic->wq[i]);

		if (error_status)

			printk(KERN_ERR PFX "%s: WQ[%d] error_status %d\n",

				enic->netdev->name, i, error_status);

			netdev_err(enic->netdev, "WQ[%d] error_status %d\n",

				i, error_status);

	}



	for (i = 0; i < enic->rq_count; i++) {

		error_status = vnic_rq_error_status(&enic->rq[i]);

		if (error_status)

			printk(KERN_ERR PFX "%s: RQ[%d] error_status %d\n",

				enic->netdev->name, i, error_status);

			netdev_err(enic->netdev, "RQ[%d] error_status %d\n",

				i, error_status);

	}

}
@@ -435,8 +435,8 @@ static void enic_msglvl_check(struct enic *enic) 
	u32 msg_enable = vnic_dev_msg_lvl(enic->vdev);



	if (msg_enable != enic->msg_enable) {

		printk(KERN_INFO PFX "%s: msg lvl changed from 0x%x to 0x%x\n",

			enic->netdev->name, enic->msg_enable, msg_enable);

		netdev_info(enic->netdev, "msg lvl changed from 0x%x to 0x%x\n",

			enic->msg_enable, msg_enable);

		enic->msg_enable = msg_enable;

	}

}
@@ -444,14 +444,15 @@ static void enic_msglvl_check(struct enic *enic) 
static void enic_mtu_check(struct enic *enic)

{

	u32 mtu = vnic_dev_mtu(enic->vdev);

	struct net_device *netdev = enic->netdev;



	if (mtu && mtu != enic->port_mtu) {

		enic->port_mtu = mtu;

		if (mtu < enic->netdev->mtu)

			printk(KERN_WARNING PFX

				"%s: interface MTU (%d) set higher "

		if (mtu < netdev->mtu)

			netdev_warn(netdev,

				"interface MTU (%d) set higher "

				"than switch port MTU (%d)\n",

				enic->netdev->name, enic->netdev->mtu, mtu);

				netdev->mtu, mtu);

	}

}
@@ -461,10 +462,10 @@ static void enic_link_check(struct enic *enic) 
	int carrier_ok = netif_carrier_ok(enic->netdev);



	if (link_status && !carrier_ok) {

		printk(KERN_INFO PFX "%s: Link UP\n", enic->netdev->name);

		netdev_info(enic->netdev, "Link UP\n");

		netif_carrier_on(enic->netdev);

	} else if (!link_status && carrier_ok) {

		printk(KERN_INFO PFX "%s: Link DOWN\n", enic->netdev->name);

		netdev_info(enic->netdev, "Link DOWN\n");

		netif_carrier_off(enic->netdev);

	}

}
@@ -788,8 +789,7 @@ static netdev_tx_t enic_hard_start_xmit(struct sk_buff *skb, 
	    skb_shinfo(skb)->nr_frags + ENIC_DESC_MAX_SPLITS) {

		netif_stop_queue(netdev);

		/* This is a hard error, log it */

		printk(KERN_ERR PFX "%s: BUG! Tx ring full when "

			"queue awake!\n", netdev->name);

		netdev_err(netdev, "BUG! Tx ring full when queue awake!\n");

		spin_unlock_irqrestore(&enic->wq_lock[0], flags);

		return NETDEV_TX_BUSY;

	}
@@ -1738,16 +1738,14 @@ static int enic_open(struct net_device *netdev) 


	err = enic_request_intr(enic);

	if (err) {

		printk(KERN_ERR PFX "%s: Unable to request irq.\n",

			netdev->name);

		netdev_err(netdev, "Unable to request irq.\n");

		return err;

	}



	err = enic_dev_notify_set(enic);

	if (err) {

		printk(KERN_ERR PFX

			"%s: Failed to alloc notify buffer, aborting.\n",

			netdev->name);

		netdev_err(netdev,

			"Failed to alloc notify buffer, aborting.\n");

		goto err_out_free_intr;

	}
@@ -1755,9 +1753,7 @@ static int enic_open(struct net_device *netdev) 
		vnic_rq_fill(&enic->rq[i], enic->rq_alloc_buf);

		/* Need at least one buffer on ring to get going */

		if (vnic_rq_desc_used(&enic->rq[i]) == 0) {

			printk(KERN_ERR PFX

				"%s: Unable to alloc receive buffers.\n",

				netdev->name);

			netdev_err(netdev, "Unable to alloc receive buffers\n");

			err = -ENOMEM;

			goto err_out_notify_unset;

		}
@@ -1851,10 +1847,9 @@ static int enic_change_mtu(struct net_device *netdev, int new_mtu) 
	netdev->mtu = new_mtu;



	if (netdev->mtu > enic->port_mtu)

		printk(KERN_WARNING PFX

			"%s: interface MTU (%d) set higher "

			"than port MTU (%d)\n",

			netdev->name, netdev->mtu, enic->port_mtu);

		netdev_warn(netdev,

			"interface MTU (%d) set higher than port MTU (%d)\n",

			netdev->mtu, enic->port_mtu);



	if (running)

		enic_open(netdev);
@@ -1927,8 +1922,8 @@ static int enic_dev_open(struct enic *enic) 
	err = enic_dev_wait(enic->vdev, vnic_dev_open,

		vnic_dev_open_done, 0);

	if (err)

		printk(KERN_ERR PFX

			"vNIC device open failed, err %d.\n", err);

		dev_err(enic_get_dev(enic), "vNIC device open failed, err %d\n",

			err);



	return err;

}
@@ -1940,8 +1935,8 @@ static int enic_dev_hang_reset(struct enic *enic) 
	err = enic_dev_wait(enic->vdev, vnic_dev_hang_reset,

		vnic_dev_hang_reset_done, 0);

	if (err)

		printk(KERN_ERR PFX

			"vNIC hang reset failed, err %d.\n", err);

		netdev_err(enic->netdev, "vNIC hang reset failed, err %d\n",

			err);



	return err;

}
@@ -2177,6 +2172,7 @@ static int enic_dev_stats_clear(struct enic *enic) 


int enic_dev_init(struct enic *enic)

{

	struct device *dev = enic_get_dev(enic);

	struct net_device *netdev = enic->netdev;

	int err;
@@ -2185,8 +2181,7 @@ int enic_dev_init(struct enic *enic) 


	err = enic_get_vnic_config(enic);

	if (err) {

		printk(KERN_ERR PFX

			"Get vNIC configuration failed, aborting.\n");

		dev_err(dev, "Get vNIC configuration failed, aborting\n");

		return err;

	}
@@ -2201,9 +2196,8 @@ int enic_dev_init(struct enic *enic) 


	err = enic_set_intr_mode(enic);

	if (err) {

		printk(KERN_ERR PFX

			"Failed to set intr mode based on resource "

			"counts and system capabilities, aborting.\n");

		dev_err(dev, "Failed to set intr mode based on resource "

			"counts and system capabilities, aborting\n");

		return err;

	}
@@ -2212,8 +2206,7 @@ int enic_dev_init(struct enic *enic) 


	err = enic_alloc_vnic_resources(enic);

	if (err) {

		printk(KERN_ERR PFX

			"Failed to alloc vNIC resources, aborting.\n");

		dev_err(dev, "Failed to alloc vNIC resources, aborting\n");

		goto err_out_free_vnic_resources;

	}
@@ -2225,21 +2218,19 @@ int enic_dev_init(struct enic *enic) 


	err = enic_set_rq_alloc_buf(enic);

	if (err) {

		printk(KERN_ERR PFX

			"Failed to set RQ buffer allocator, aborting.\n");

		dev_err(dev, "Failed to set RQ buffer allocator, aborting\n");

		goto err_out_free_vnic_resources;

	}



	err = enic_set_niccfg(enic);

	if (err) {

		printk(KERN_ERR PFX

			"Failed to config nic, aborting.\n");

		dev_err(dev, "Failed to config nic, aborting\n");

		goto err_out_free_vnic_resources;

	}



	err = enic_dev_set_ig_vlan_rewrite_mode(enic);

	if (err) {

		printk(KERN_ERR PFX

		netdev_err(netdev,

			"Failed to set ingress vlan rewrite mode, aborting.\n");

		goto err_out_free_vnic_resources;

	}
@@ -2274,6 +2265,7 @@ static void enic_iounmap(struct enic *enic) 
static int __devinit enic_probe(struct pci_dev *pdev,

	const struct pci_device_id *ent)

{

	struct device *dev = &pdev->dev;

	struct net_device *netdev;

	struct enic *enic;

	int using_dac = 0;
@@ -2286,7 +2278,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, 


	netdev = alloc_etherdev(sizeof(struct enic));

	if (!netdev) {

		printk(KERN_ERR PFX "Etherdev alloc failed, aborting.\n");

		pr_err("Etherdev alloc failed, aborting\n");

		return -ENOMEM;

	}
@@ -2303,15 +2295,13 @@ static int __devinit enic_probe(struct pci_dev *pdev, 


	err = pci_enable_device(pdev);

	if (err) {

		printk(KERN_ERR PFX

			"Cannot enable PCI device, aborting.\n");

		dev_err(dev, "Cannot enable PCI device, aborting\n");

		goto err_out_free_netdev;

	}



	err = pci_request_regions(pdev, DRV_NAME);

	if (err) {

		printk(KERN_ERR PFX

			"Cannot request PCI regions, aborting.\n");

		dev_err(dev, "Cannot request PCI regions, aborting\n");

		goto err_out_disable_device;

	}
@@ -2326,23 +2316,20 @@ static int __devinit enic_probe(struct pci_dev *pdev, 
	if (err) {

		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

		if (err) {

			printk(KERN_ERR PFX

				"No usable DMA configuration, aborting.\n");

			dev_err(dev, "No usable DMA configuration, aborting\n");

			goto err_out_release_regions;

		}

		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		if (err) {

			printk(KERN_ERR PFX

				"Unable to obtain 32-bit DMA "

				"for consistent allocations, aborting.\n");

			dev_err(dev, "Unable to obtain %u-bit DMA "

				"for consistent allocations, aborting\n", 32);

			goto err_out_release_regions;

		}

	} else {

		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));

		if (err) {

			printk(KERN_ERR PFX

				"Unable to obtain 40-bit DMA "

				"for consistent allocations, aborting.\n");

			dev_err(dev, "Unable to obtain %u-bit DMA "

				"for consistent allocations, aborting\n", 40);

			goto err_out_release_regions;

		}

		using_dac = 1;
@@ -2357,8 +2344,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, 
		enic->bar[i].len = pci_resource_len(pdev, i);

		enic->bar[i].vaddr = pci_iomap(pdev, i, enic->bar[i].len);

		if (!enic->bar[i].vaddr) {

			printk(KERN_ERR PFX

				"Cannot memory-map BAR %d, aborting.\n", i);

			dev_err(dev, "Cannot memory-map BAR %d, aborting\n", i);

			err = -ENODEV;

			goto err_out_iounmap;

		}
@@ -2371,8 +2357,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, 
	enic->vdev = vnic_dev_register(NULL, enic, pdev, enic->bar,

		ARRAY_SIZE(enic->bar));

	if (!enic->vdev) {

		printk(KERN_ERR PFX

			"vNIC registration failed, aborting.\n");

		dev_err(dev, "vNIC registration failed, aborting\n");

		err = -ENODEV;

		goto err_out_iounmap;

	}
@@ -2382,8 +2367,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, 


	err = enic_dev_open(enic);

	if (err) {

		printk(KERN_ERR PFX

			"vNIC dev open failed, aborting.\n");

		dev_err(dev, "vNIC dev open failed, aborting\n");

		goto err_out_vnic_unregister;

	}
@@ -2397,11 +2381,15 @@ static int __devinit enic_probe(struct pci_dev *pdev, 


	netif_carrier_off(netdev);



	/* Do not call dev_init for a dynamic vnic.

	 * For a dynamic vnic, init_prov_info will be

	 * called later by an upper layer.

	 */



	if (!enic_is_dynamic(enic)) {

		err = vnic_dev_init(enic->vdev, 0);

		if (err) {

			printk(KERN_ERR PFX

				"vNIC dev init failed, aborting.\n");

			dev_err(dev, "vNIC dev init failed, aborting\n");

			goto err_out_dev_close;

		}

	}
@@ -2413,8 +2401,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, 


	err = enic_dev_init(enic);

	if (err) {

		printk(KERN_ERR PFX

			"Device initialization failed, aborting.\n");

		dev_err(dev, "Device initialization failed, aborting\n");

		goto err_out_dev_close;

	}
@@ -2438,8 +2425,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, 


	err = enic_set_mac_addr(netdev, enic->mac_addr);

	if (err) {

		printk(KERN_ERR PFX

			"Invalid MAC address, aborting.\n");

		dev_err(dev, "Invalid MAC address, aborting\n");

		goto err_out_dev_deinit;

	}
@@ -2469,8 +2455,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, 


	err = register_netdev(netdev);

	if (err) {

		printk(KERN_ERR PFX

			"Cannot register net device, aborting.\n");

		dev_err(dev, "Cannot register net device, aborting\n");

		goto err_out_dev_deinit;

	}
@@ -2524,7 +2509,7 @@ static struct pci_driver enic_driver = { 


static int __init enic_init_module(void)

{

	printk(KERN_INFO PFX "%s, ver %s\n", DRV_DESCRIPTION, DRV_VERSION);

	pr_info("%s, ver %s\n", DRV_DESCRIPTION, DRV_VERSION);



	return pci_register_driver(&enic_driver);

}

drivers/net/enic/enic_res.c

+14 −13
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ int enic_get_vnic_config(struct enic *enic) 


	err = vnic_dev_mac_addr(enic->vdev, enic->mac_addr);

	if (err) {

		printk(KERN_ERR PFX "Error getting MAC addr, %d\n", err);

		dev_err(enic_get_dev(enic),

			"Error getting MAC addr, %d\n", err);

		return err;

	}
@@ -56,7 +57,7 @@ int enic_get_vnic_config(struct enic *enic) 
			offsetof(struct vnic_enet_config, m), \

			sizeof(c->m), &c->m); \

		if (err) { \

			printk(KERN_ERR PFX \

			dev_err(enic_get_dev(enic), \

				"Error getting %s, %d\n", #m, err); \

			return err; \

		} \
@@ -92,10 +93,10 @@ int enic_get_vnic_config(struct enic *enic) 
		INTR_COALESCE_HW_TO_USEC(VNIC_INTR_TIMER_MAX),

		c->intr_timer_usec);



	printk(KERN_INFO PFX "vNIC MAC addr %pM wq/rq %d/%d\n",

	dev_info(enic_get_dev(enic), "vNIC MAC addr %pM wq/rq %d/%d\n",

		enic->mac_addr, c->wq_desc_count, c->rq_desc_count);

	printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d "

		"intr timer %d usec\n",

	dev_info(enic_get_dev(enic), "vNIC mtu %d csum tx/rx %d/%d "

		"tso/lro %d/%d intr timer %d usec\n",

		c->mtu, ENIC_SETTING(enic, TXCSUM),

		ENIC_SETTING(enic, RXCSUM), ENIC_SETTING(enic, TSO),

		ENIC_SETTING(enic, LRO), c->intr_timer_usec);
@@ -111,7 +112,7 @@ int enic_add_vlan(struct enic *enic, u16 vlanid) 


	err = vnic_dev_cmd(enic->vdev, CMD_VLAN_ADD, &a0, &a1, wait);

	if (err)

		printk(KERN_ERR PFX "Can't add vlan id, %d\n", err);

		dev_err(enic_get_dev(enic), "Can't add vlan id, %d\n", err);



	return err;

}
@@ -124,7 +125,7 @@ int enic_del_vlan(struct enic *enic, u16 vlanid) 


	err = vnic_dev_cmd(enic->vdev, CMD_VLAN_DEL, &a0, &a1, wait);

	if (err)

		printk(KERN_ERR PFX "Can't delete vlan id, %d\n", err);

		dev_err(enic_get_dev(enic), "Can't delete vlan id, %d\n", err);



	return err;

}
@@ -192,8 +193,8 @@ void enic_get_res_counts(struct enic *enic) 
		vnic_dev_get_res_count(enic->vdev, RES_TYPE_INTR_CTRL),

		ENIC_INTR_MAX);



	printk(KERN_INFO PFX "vNIC resources avail: "

		"wq %d rq %d cq %d intr %d\n",

	dev_info(enic_get_dev(enic),

		"vNIC resources avail: wq %d rq %d cq %d intr %d\n",

		enic->wq_count, enic->rq_count,

		enic->cq_count, enic->intr_count);

}
@@ -308,15 +309,14 @@ int enic_alloc_vnic_resources(struct enic *enic) 


	intr_mode = vnic_dev_get_intr_mode(enic->vdev);



	printk(KERN_INFO PFX "vNIC resources used:  "

	dev_info(enic_get_dev(enic), "vNIC resources used:  "

		"wq %d rq %d cq %d intr %d intr mode %s\n",

		enic->wq_count, enic->rq_count,

		enic->cq_count, enic->intr_count,

		intr_mode == VNIC_DEV_INTR_MODE_INTX ? "legacy PCI INTx" :

		intr_mode == VNIC_DEV_INTR_MODE_MSI ? "MSI" :

		intr_mode == VNIC_DEV_INTR_MODE_MSIX ? "MSI-X" :

		"unknown"

		);

		"unknown");



	/* Allocate queue resources

	 */
@@ -362,7 +362,8 @@ int enic_alloc_vnic_resources(struct enic *enic) 
	enic->legacy_pba = vnic_dev_get_res(enic->vdev,

		RES_TYPE_INTR_PBA_LEGACY, 0);

	if (!enic->legacy_pba && intr_mode == VNIC_DEV_INTR_MODE_INTX) {

		printk(KERN_ERR PFX "Failed to hook legacy pba resource\n");

		dev_err(enic_get_dev(enic),

			"Failed to hook legacy pba resource\n");

		err = -ENODEV;

		goto err_out_cleanup;

	}

drivers/net/enic/vnic_cq.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int vnic_cq_alloc(struct vnic_dev *vdev, struct vnic_cq *cq, unsigned int index, 


	cq->ctrl = vnic_dev_get_res(vdev, RES_TYPE_CQ, index);

	if (!cq->ctrl) {

		printk(KERN_ERR "Failed to hook CQ[%d] resource\n", index);

		pr_err("Failed to hook CQ[%d] resource\n", index);

		return -EINVAL;

	}

drivers/net/enic/vnic_dev.c

+13 −16
Original line number Diff line number Diff line
@@ -78,19 +78,19 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev, 
		return -EINVAL;



	if (bar->len < VNIC_MAX_RES_HDR_SIZE) {

		printk(KERN_ERR "vNIC BAR0 res hdr length error\n");

		pr_err("vNIC BAR0 res hdr length error\n");

		return -EINVAL;

	}



	rh = bar->vaddr;

	if (!rh) {

		printk(KERN_ERR "vNIC BAR0 res hdr not mem-mapped\n");

		pr_err("vNIC BAR0 res hdr not mem-mapped\n");

		return -EINVAL;

	}



	if (ioread32(&rh->magic) != VNIC_RES_MAGIC ||

	    ioread32(&rh->version) != VNIC_RES_VERSION) {

		printk(KERN_ERR "vNIC BAR0 res magic/version error "

		pr_err("vNIC BAR0 res magic/version error "

			"exp (%lx/%lx) curr (%x/%x)\n",

			VNIC_RES_MAGIC, VNIC_RES_VERSION,

			ioread32(&rh->magic), ioread32(&rh->version));
@@ -122,7 +122,7 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev, 
			/* each count is stride bytes long */

			len = count * VNIC_RES_STRIDE;

			if (len + bar_offset > bar[bar_num].len) {

				printk(KERN_ERR "vNIC BAR0 resource %d "

				pr_err("vNIC BAR0 resource %d "

					"out-of-bounds, offset 0x%x + "

					"size 0x%x > bar len 0x%lx\n",

					type, bar_offset,
@@ -229,8 +229,7 @@ int vnic_dev_alloc_desc_ring(struct vnic_dev *vdev, struct vnic_dev_ring *ring, 
		&ring->base_addr_unaligned);



	if (!ring->descs_unaligned) {

		printk(KERN_ERR

		  "Failed to allocate ring (size=%d), aborting\n",

		pr_err("Failed to allocate ring (size=%d), aborting\n",

			(int)ring->size);

		return -ENOMEM;

	}
@@ -268,7 +267,7 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, 


	status = ioread32(&devcmd->status);

	if (status & STAT_BUSY) {

		printk(KERN_ERR "Busy devcmd %d\n", _CMD_N(cmd));

		pr_err("Busy devcmd %d\n", _CMD_N(cmd));

		return -EBUSY;

	}
@@ -294,7 +293,7 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, 
				err = (int)readq(&devcmd->args[0]);

				if (err != ERR_ECMDUNKNOWN ||

				    cmd != CMD_CAPABILITY)

					printk(KERN_ERR "Error %d devcmd %d\n",

					pr_err("Error %d devcmd %d\n",

						err, _CMD_N(cmd));

				return err;

			}
@@ -309,7 +308,7 @@ int vnic_dev_cmd(struct vnic_dev *vdev, enum vnic_devcmd_cmd cmd, 
		}

	}



	printk(KERN_ERR "Timedout devcmd %d\n", _CMD_N(cmd));

	pr_err("Timedout devcmd %d\n", _CMD_N(cmd));

	return -ETIMEDOUT;

}
@@ -565,7 +564,7 @@ int vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast, 


	err = vnic_dev_cmd(vdev, CMD_PACKET_FILTER, &a0, &a1, wait);

	if (err)

		printk(KERN_ERR "Can't set packet filter\n");

		pr_err("Can't set packet filter\n");



	return err;

}
@@ -582,7 +581,7 @@ int vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr) 


	err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);

	if (err)

		printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err);

		pr_err("Can't add addr [%pM], %d\n", addr, err);



	return err;

}
@@ -599,7 +598,7 @@ int vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr) 


	err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);

	if (err)

		printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err);

		pr_err("Can't del addr [%pM], %d\n", addr, err);



	return err;

}
@@ -626,8 +625,7 @@ int vnic_dev_raise_intr(struct vnic_dev *vdev, u16 intr) 


	err = vnic_dev_cmd(vdev, CMD_IAR, &a0, &a1, wait);

	if (err)

		printk(KERN_ERR "Failed to raise INTR[%d], err %d\n",

			intr, err);

		pr_err("Failed to raise INTR[%d], err %d\n", intr, err);



	return err;

}
@@ -658,8 +656,7 @@ int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr) 
	dma_addr_t notify_pa;



	if (vdev->notify || vdev->notify_pa) {

		printk(KERN_ERR "notify block %p still allocated",

			vdev->notify);

		pr_err("notify block %p still allocated", vdev->notify);

		return -EINVAL;

	}