ethernet: use eth_hw_addr_set() instead of ether_addr_copy()

[linux-2.6-microblaze.git] / drivers / net / ethernet / cavium / thunder / nicvf_main.c

diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index d1667b7..5ef704c 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -221,8 +221,7 @@ static void  nicvf_handle_mbx_intr(struct nicvf *nic)
                nic->tns_mode = mbx.nic_cfg.tns_mode & 0x7F;
                nic->node = mbx.nic_cfg.node_id;
                if (!nic->set_mac_pending)
-                       ether_addr_copy(nic->netdev->dev_addr,
-                                       mbx.nic_cfg.mac_addr);
+                       eth_hw_addr_set(nic->netdev, mbx.nic_cfg.mac_addr);
                nic->sqs_mode = mbx.nic_cfg.sqs_mode;
                nic->loopback_supported = mbx.nic_cfg.loopback_supported;
                nic->link_up = false;
@@ -2119,10 +2118,8 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
 
        err = pci_enable_device(pdev);
-       if (err) {
-               dev_err(dev, "Failed to enable PCI device\n");
-               return err;
-       }
+       if (err)
+               return dev_err_probe(dev, err, "Failed to enable PCI device\n");
 
        err = pci_request_regions(pdev, DRV_NAME);
        if (err) {