diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-08-27 11:01:49 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:28 -0700 |
| commit | f2c98d27b8e88cd17bb3e77f8fccf70f8d2ebd2f (patch) | |
| tree | fbc73db3537306610e6f2e08b19d9c028616c373 /drivers/staging/et131x/et131x_isr.c | |
| parent | b8ab735253320dcb9432d941536a49640cdbd914 (diff) | |
Staging: et131x: clean up PM_CSR_t
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_isr.c')
| -rw-r--r-- | drivers/staging/et131x/et131x_isr.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c index 478569fcab1..00b815ac12c 100644 --- a/drivers/staging/et131x/et131x_isr.c +++ b/drivers/staging/et131x/et131x_isr.c @@ -274,14 +274,13 @@ void et131x_isr_handler(struct work_struct *work) */ if (etdev->FlowControl == TxOnly || etdev->FlowControl == Both) { - PM_CSR_t pm_csr; + u32 pm_csr; /* Tell the device to send a pause packet via * the back pressure register */ - pm_csr.value = - readl(&iomem->global.pm_csr.value); - if (pm_csr.bits.pm_phy_sw_coma == 0) { + pm_csr = readl(&iomem->global.pm_csr); + if ((pm_csr & ET_PM_PHY_SW_COMA) == 0) { TXMAC_BP_CTRL_t bp_ctrl = { 0 }; bp_ctrl.bits.bp_req = 1; @@ -351,7 +350,7 @@ void et131x_isr_handler(struct work_struct *work) /* Handle the PHY interrupt */ if (GlobStatus.bits.phy_interrupt) { - PM_CSR_t pm_csr; + u32 pm_csr; MI_BMSR_t BmsrInts, BmsrData; MI_ISR_t myIsr; @@ -360,8 +359,8 @@ void et131x_isr_handler(struct work_struct *work) /* If we are in coma mode when we get this interrupt, * we need to disable it. */ - pm_csr.value = readl(&iomem->global.pm_csr.value); - if (pm_csr.bits.pm_phy_sw_coma == 1) { + pm_csr = readl(&iomem->global.pm_csr); + if (pm_csr & ET_PM_PHY_SW_COMA) { /* * Check to see if we are in coma mode and if * so, disable it because we will not be able |