diff options
| author |   Alan Cox <alan@linux.intel.com> | 2009-08-19 18:21:50 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:26 -0700 |
| commit | 37628606661a8a1d3abfa5bb898426a38fa62b73 (patch) | |
| tree | 40d3ba821c49ea87ef319c5f07eadb536ebc2da9 /drivers/staging/et131x/et1310_phy.c | |
| parent | Staging: et1310: kill pAdapter in favour of a sane name (diff) | |
| download | linux-dev-37628606661a8a1d3abfa5bb898426a38fa62b73.tar.xz linux-dev-37628606661a8a1d3abfa5bb898426a38fa62b73.zip | |
Staging: et131x: spinlocks
Switch to the more normal "flags" naming. Also fix up the nested use of
spin_lock_irqsave
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_phy.c')
| -rw-r--r-- | drivers/staging/et131x/et1310_phy.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c index 82fcb6678e24..d9c7a4486b41 100644 --- a/drivers/staging/et131x/et1310_phy.c +++ b/drivers/staging/et131x/et1310_phy.c @@ -484,7 +484,7 @@ void et131x_Mii_check(struct et131x_adapter *etdev, uint32_t uiMdiMdix; uint32_t uiMasterSlave; uint32_t uiPolarity; - unsigned long lockflags; + unsigned long flags; DBG_ENTER(et131x_dbginfo); @@ -495,12 +495,12 @@ void et131x_Mii_check(struct et131x_adapter *etdev, /* Update our state variables and indicate the * connected state */ - spin_lock_irqsave(&etdev->Lock, lockflags); + spin_lock_irqsave(&etdev->Lock, flags); etdev->MediaState = NETIF_STATUS_MEDIA_CONNECT; MP_CLEAR_FLAG(etdev, fMP_ADAPTER_LINK_DETECTION); - spin_unlock_irqrestore(&etdev->Lock, lockflags); + spin_unlock_irqrestore(&etdev->Lock, flags); /* Don't indicate state if we're in loopback mode */ if (etdev->RegistryPhyLoopbk == false) @@ -533,11 +533,11 @@ void et131x_Mii_check(struct et131x_adapter *etdev, (etdev, fMP_ADAPTER_LINK_DETECTION)) || (etdev->MediaState == NETIF_STATUS_MEDIA_DISCONNECT)) { - spin_lock_irqsave(&etdev->Lock, lockflags); + spin_lock_irqsave(&etdev->Lock, flags); etdev->MediaState = NETIF_STATUS_MEDIA_DISCONNECT; spin_unlock_irqrestore(&etdev->Lock, - lockflags); + flags); /* Only indicate state if we're in loopback * mode |