1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 60f96c468a24..c1bb24cf0793 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -168,7 +168,7 @@ static void rtl_hw_start_8169(struct net_device *);
 static void rtl_hw_start_8168(struct net_device *);
 static void rtl_hw_start_8101(struct net_device *);
 
-static struct pci_device_id rtl8169_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = {
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8129), 0, 0, RTL_CFG_0 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8136), 0, 0, RTL_CFG_2 },
         { PCI_DEVICE(PCI_VENDOR_ID_REALTEK,     0x8167), 0, 0, RTL_CFG_0 },
@@ -3188,15 +3188,10 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         if (netif_msg_probe(tp)) {
                 u32 xid = RTL_R32(TxConfig) & 0x9cf0f8ff;
 
-                printk(KERN_INFO "%s: %s at 0x%lx, "
-                       "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "
-                       "XID %08x IRQ %d\n",
+                printk(KERN_INFO "%s: %s at 0x%lx, %pM, XID %08x IRQ %d\n",
                        dev->name,
                        rtl_chip_info[tp->chipset].name,
-                       dev->base_addr,
-                       dev->dev_addr[0], dev->dev_addr[1],
-                       dev->dev_addr[2], dev->dev_addr[3],
-                       dev->dev_addr[4], dev->dev_addr[5], xid, dev->irq);
+                       dev->base_addr, dev->dev_addr, xid, dev->irq);
         }
 
         rtl8169_init_phy(dev, tp);