1 files changed, 14 insertions, 13 deletions

diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
index 04cfc4e3f06..478928b7cc0 100644
--- a/drivers/net/enic/enic_res.c
+++ b/drivers/net/enic/enic_res.c
@@ -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;
         }