1 files changed, 4 insertions, 11 deletions

diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c
index 0dbd0320023a..a6c39209f66f 100644
--- a/drivers/net/igbvf/netdev.c
+++ b/drivers/net/igbvf/netdev.c
@@ -2608,11 +2608,7 @@ static void igbvf_print_device_info(struct igbvf_adapter *adapter)
         struct pci_dev *pdev = adapter->pdev;
 
         dev_info(&pdev->dev, "Intel(R) 82576 Virtual Function\n");
-        dev_info(&pdev->dev, "Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                 /* MAC address */
-                 netdev->dev_addr[0], netdev->dev_addr[1],
-                 netdev->dev_addr[2], netdev->dev_addr[3],
-                 netdev->dev_addr[4], netdev->dev_addr[5]);
+        dev_info(&pdev->dev, "Address: %pM\n", netdev->dev_addr);
         dev_info(&pdev->dev, "MAC: %d\n", hw->mac.type);
 }
 
@@ -2778,11 +2774,8 @@ static int __devinit igbvf_probe(struct pci_dev *pdev,
         memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
 
         if (!is_valid_ether_addr(netdev->perm_addr)) {
-                dev_err(&pdev->dev, "Invalid MAC Address: "
-                        "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                        netdev->dev_addr[0], netdev->dev_addr[1],
-                        netdev->dev_addr[2], netdev->dev_addr[3],
-                        netdev->dev_addr[4], netdev->dev_addr[5]);
+                dev_err(&pdev->dev, "Invalid MAC Address: %pM\n",
+                        netdev->dev_addr);
                 err = -EIO;
                 goto err_hw_init;
         }
@@ -2884,7 +2877,7 @@ static struct pci_error_handlers igbvf_err_handler = {
         .resume = igbvf_io_resume,
 };
 
-static struct pci_device_id igbvf_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(igbvf_pci_tbl) = {
         { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_VF), board_vf },
         { } /* terminate list */
 };