drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

[net-next-2.6.git] / drivers / net / skfp / skfddi.c

diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c
index db216a7285035e24b742435cb93eb38bb5174939..6b955a4f19b2d25615b27e5e51b1be9ba27c4713 100644 (file)
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/skfp/skfddi.c
@@ -149,7 +149,7 @@ extern void mac_drv_rx_mode(struct s_smc *smc, int mode);
 extern void mac_drv_clear_rx_queue(struct s_smc *smc);
 extern void enable_tx_irq(struct s_smc *smc, u_short queue);
 
-static struct pci_device_id skfddi_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(skfddi_pci_tbl) = {
        { PCI_VENDOR_ID_SK, PCI_DEVICE_ID_SK_FP, PCI_ANY_ID, PCI_ANY_ID, },
        { }                     /* Terminating entry */
 };
@@ -435,13 +435,7 @@ static  int skfp_driver_init(struct net_device *dev)
                goto fail;
        }
        read_address(smc, NULL);
-       pr_debug(KERN_INFO "HW-Addr: %02x %02x %02x %02x %02x %02x\n",
-              smc->hw.fddi_canon_addr.a[0],
-              smc->hw.fddi_canon_addr.a[1],
-              smc->hw.fddi_canon_addr.a[2],
-              smc->hw.fddi_canon_addr.a[3],
-              smc->hw.fddi_canon_addr.a[4],
-              smc->hw.fddi_canon_addr.a[5]);
+       pr_debug(KERN_INFO "HW-Addr: %pMF\n", smc->hw.fddi_canon_addr.a);
        memcpy(dev->dev_addr, smc->hw.fddi_canon_addr.a, 6);
 
        smt_reset_defaults(smc, 0);
@@ -890,15 +884,8 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
                                                          (struct fddi_addr *)dmi->dmi_addr, 
                                                          1);
 
-                                       pr_debug(KERN_INFO "ENABLE MC ADDRESS:");
-                                       pr_debug(" %02x %02x %02x ",
-                                              dmi->dmi_addr[0],
-                                              dmi->dmi_addr[1],
-                                              dmi->dmi_addr[2]);
-                                       pr_debug("%02x %02x %02x\n",
-                                              dmi->dmi_addr[3],
-                                              dmi->dmi_addr[4],
-                                              dmi->dmi_addr[5]);
+                                       pr_debug(KERN_INFO "ENABLE MC ADDRESS: %pMF\n",
+                                               dmi->dmi_addr);
                                        dmi = dmi->next;
                                }       // for