summaryrefslogtreecommitdiff
path: root/drivers/staging/et131x/et131x_isr.c
diff options
context:
space:
mode:
authorMark Einon <mark.einon@gmail.com>2011-07-04 21:11:45 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-05 19:54:58 -0700
commitb7ac48fa1fb1e496ff22b60712e91badc4f2d26d (patch)
treed71ed8ba0b83f0e49412cbe32c668d1e74a30b49 /drivers/staging/et131x/et131x_isr.c
parent13425aa1ce6011625bc270194c40fc7eb9c0d624 (diff)
staging: et131x: Remove typedefs from et1310_phy.h
Fixes the associated checkpatch warnings. Tested with ifconfig/general use of a device (Agere Systems ET-131x PCI-E Ethernet Controller (rev 02)). Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et131x_isr.c')
-rw-r--r--drivers/staging/et131x/et131x_isr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c
index 19d67264ff9c..0a5ce8096ecb 100644
--- a/drivers/staging/et131x/et131x_isr.c
+++ b/drivers/staging/et131x/et131x_isr.c
@@ -365,7 +365,8 @@ void et131x_isr_handler(struct work_struct *work)
/* Handle the PHY interrupt */
if (status & ET_INTR_PHY) {
u32 pm_csr;
- MI_BMSR_t BmsrInts, BmsrData;
+ u16 bmsr_ints;
+ u16 bmsr_data;
u16 myisr;
/* If we are in coma mode when we get this interrupt,
@@ -390,14 +391,13 @@ void et131x_isr_handler(struct work_struct *work)
if (!etdev->ReplicaPhyLoopbk) {
MiRead(etdev,
(uint8_t) offsetof(struct mi_regs, bmsr),
- &BmsrData.value);
+ &bmsr_data);
- BmsrInts.value =
- etdev->Bmsr.value ^ BmsrData.value;
- etdev->Bmsr.value = BmsrData.value;
+ bmsr_ints = etdev->bmsr ^ bmsr_data;
+ etdev->bmsr = bmsr_data;
/* Do all the cable in / cable out stuff */
- et131x_Mii_check(etdev, BmsrData, BmsrInts);
+ et131x_Mii_check(etdev, bmsr_data, bmsr_ints);
}
}