Commit 3e3b5f39 authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman

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: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e2963962
...@@ -364,44 +364,6 @@ void et131x_isr_handler(struct work_struct *work) ...@@ -364,44 +364,6 @@ void et131x_isr_handler(struct work_struct *work)
dev_err(&adapter->pdev->dev, "WAKE_ON_LAN interrupt\n"); 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 */ /* Let's move on to the TxMac */
if (status & ET_INTR_TXMAC) { if (status & ET_INTR_TXMAC) {
u32 err = readl(&iomem->txmac.err); u32 err = readl(&iomem->txmac.err);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment