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/et131x_initpci.c | |
| parent | 25ad00bba42d49e37e81e7c449bbcc86a71f2894 (diff) | |
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/et131x_initpci.c')
| -rw-r--r-- | drivers/staging/et131x/et131x_initpci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index 8455e0a8471a..b9018e6f5660 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -492,18 +492,18 @@ void et131x_error_timer_handler(unsigned long data) void et131x_link_detection_handler(unsigned long data) { struct et131x_adapter *etdev = (struct et131x_adapter *) data; - unsigned long lockflags; + unsigned long flags; /* Let everyone know that we have run */ etdev->bLinkTimerActive = false; if (etdev->MediaState == 0) { - spin_lock_irqsave(&etdev->Lock, lockflags); + spin_lock_irqsave(&etdev->Lock, flags); etdev->MediaState = NETIF_STATUS_MEDIA_DISCONNECT; MP_CLEAR_FLAG(etdev, fMP_ADAPTER_LINK_DETECTION); - spin_unlock_irqrestore(&etdev->Lock, lockflags); + spin_unlock_irqrestore(&etdev->Lock, flags); netif_carrier_off(etdev->netdev); |