Merge branch 'linux-2.6'

[linux-2.6-omap-h63xx.git] / drivers / net / tulip / dmfe.c

diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index dab74feb44bcf125937d66d674a87c806592f64b..b4891caeae5ad36aeeb0ed913ecdc85fe012ade3 100644 (file)
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -362,6 +362,7 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
        struct net_device *dev;
        u32 pci_pmr;
        int i, err;
+       DECLARE_MAC_BUF(mac);
 
        DMFE_DBUG(0, "dmfe_init_one()", 0);
 
@@ -372,7 +373,6 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
        dev = alloc_etherdev(sizeof(*db));
        if (dev == NULL)
                return -ENOMEM;
-       SET_MODULE_OWNER(dev);
        SET_NETDEV_DEV(dev, &pdev->dev);
 
        if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
@@ -471,13 +471,13 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
        if (err)
                goto err_out_res;
 
-       printk(KERN_INFO "%s: Davicom DM%04lx at pci%s,",
-               dev->name,
-               ent->driver_data >> 16,
-               pci_name(pdev));
-       for (i = 0; i < 6; i++)
-               printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]);
-       printk(", irq %d.\n", dev->irq);
+       printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
+              "%s, irq %d.\n",
+              dev->name,
+              ent->driver_data >> 16,
+              pci_name(pdev),
+              print_mac(mac, dev->dev_addr),
+              dev->irq);
 
        pci_set_master(pdev);
 
@@ -2118,8 +2118,8 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state)
        pci_enable_wake(pci_dev, PCI_D3cold, 1);
 
        /* Power down device*/
-       pci_set_power_state(pci_dev, pci_choose_state (pci_dev,state));
        pci_save_state(pci_dev);
+       pci_set_power_state(pci_dev, pci_choose_state (pci_dev, state));
 
        return 0;
 }
@@ -2129,8 +2129,8 @@ static int dmfe_resume(struct pci_dev *pci_dev)
        struct net_device *dev = pci_get_drvdata(pci_dev);
        u32 tmp;
 
-       pci_restore_state(pci_dev);
        pci_set_power_state(pci_dev, PCI_D0);
+       pci_restore_state(pci_dev);
 
        /* Re-initilize DM910X board */
        dmfe_init_dm910x(dev);