]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
[netdrvr] atl1e: Don't take the mdio_lock in atl1e_probe
authorMatthew Wilcox <matthew@wil.cx>
Tue, 12 Aug 2008 13:13:14 +0000 (07:13 -0600)
committerJeff Garzik <jgarzik@redhat.com>
Wed, 24 Sep 2008 22:49:01 +0000 (18:49 -0400)
Lockdep warns about the mdio_lock taken with interrupts enabled then later
taken from interrupt context.  Initially, I considered changing these
to spin_lock_irq/spin_unlock_irq, but then I looked at atl1e_phy_init()
and saw that it calls msleep().  Sleeping while holding a spinlock is
not allowed either.

In the probe path, we haven't registered the interrupt handler, so
it can't poke at this card yet.  It's before we call register_netdev(),
so I don't think any other threads can reach this card either.  If I'm
right, we don't need a spinlock at all.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
drivers/net/atl1e/atl1e_main.c

index 7685b995ff9b5d0ad20ab8bf2bc3ae7f8a1510f0..9b603528143d6dcee4da35059d74a7a0e8902964 100644 (file)
@@ -2390,9 +2390,7 @@ static int __devinit atl1e_probe(struct pci_dev *pdev,
        }
 
        /* Init GPHY as early as possible due to power saving issue  */
-       spin_lock(&adapter->mdio_lock);
        atl1e_phy_init(&adapter->hw);
-       spin_unlock(&adapter->mdio_lock);
        /* reset the controller to
         * put the device in a known good starting state */
        err = atl1e_reset_hw(&adapter->hw);