summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew@wil.cx>2008-08-12 07:13:14 -0600
committerJeff Garzik <jgarzik@redhat.com>2008-09-24 18:49:01 -0400
commitf382a0a8e9403c6d7f8b2cfa21e41fefb5d0c9bd (patch)
tree2fa31ffb8dc9c32d5e497309c3388e57f19b9e95
parent70666c71957b62c8e9ea5c0d999a4bfd214c80d2 (diff)
downloadlinux-f382a0a8e9403c6d7f8b2cfa21e41fefb5d0c9bd.tar.gz
[netdrvr] atl1e: Don't take the mdio_lock in atl1e_probe
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>
-rw-r--r--drivers/net/atl1e/atl1e_main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 7685b995ff9b..9b603528143d 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -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);