diff options
| author | Mark Einon <mark.einon@gmail.com> | 2011-09-04 11:24:35 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 16:54:54 -0700 |
| commit | 3e3b5f39159b97baa1dd38bff848aeccd996b7f0 (patch) | |
| tree | 36f971bfee8fbc54771401e331521d5e2683d49a /drivers/staging/et131x/et131x_isr.c | |
| parent | e2963962aec7e953063c6a1e031a64ca9f5fd47b (diff) | |
staging: et131x: Remove PHY interrupt handling code from driver isr handler
The PHY interrupt is now handled by the phy_device, and the equivalent code is present in et131x_adjust_link, called from the phy_device when needed.
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.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c index 94565c10f1ba..b3290e9356e4 100644 --- a/drivers/staging/et131x/et131x_isr.c +++ b/drivers/staging/et131x/et131x_isr.c @@ -364,44 +364,6 @@ void et131x_isr_handler(struct work_struct *work) dev_err(&adapter->pdev->dev, "WAKE_ON_LAN interrupt\n"); } - /* Handle the PHY interrupt */ - if (status & ET_INTR_PHY) { - u32 pm_csr; - u16 bmsr_ints; - u16 bmsr_data; - u16 myisr; - - /* If we are in coma mode when we get this interrupt, - * we need to disable it. - */ - 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 - * to read PHY values until we are out. - */ - et1310_disable_phy_coma(adapter); - } - - /* Read the PHY ISR to clear the reason for the - * interrupt. - */ - et131x_mii_read(adapter, - (uint8_t) offsetof(struct mi_regs, isr), - &myisr); - - et131x_mii_read(adapter, - (uint8_t) offsetof(struct mi_regs, bmsr), - &bmsr_data); - - bmsr_ints = adapter->bmsr ^ bmsr_data; - adapter->bmsr = bmsr_data; - - /* Do all the cable in / cable out stuff */ - et131x_mii_check(adapter, bmsr_data, bmsr_ints); - } - /* Let's move on to the TxMac */ if (status & ET_INTR_TXMAC) { u32 err = readl(&iomem->txmac.err); |