From: Mark Einon <mark.einon@gmail.com>
To: gregkh@suse.de
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
o.hartmann@telovital.com, Mark Einon <mark.einon@gmail.com>
Subject: [PATCH 04/12] staging: et131x: Remove PHY interrupt handling code from driver isr handler
Date: Sun, 4 Sep 2011 11:24:35 +0100 [thread overview]
Message-ID: <1315131883-11068-5-git-send-email-mark.einon@gmail.com> (raw)
In-Reply-To: <1315131883-11068-1-git-send-email-mark.einon@gmail.com>
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>
---
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 94565c1..b3290e9 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);
--
1.7.6
next prev parent reply other threads:[~2011-09-04 10:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-04 10:24 [PATCH 00/12] staging: et131x: Following mvoe to use phydev, remove detritus Mark Einon
2011-09-04 10:24 ` [PATCH 01/12] staging: et131x: Remove private adapter->linkspeed and use phydev->speed instead Mark Einon
2011-09-04 10:24 ` [PATCH 02/12] staging: et131x: Remove private adapter->duplex_mode and use phydev->duplex instead Mark Einon
2011-09-04 10:24 ` [PATCH 03/12] staging: et131x: Remove redundant struct adapter members Mark Einon
2011-09-04 10:24 ` Mark Einon [this message]
2011-09-04 10:24 ` [PATCH 05/12] staging: et131x: remove calls to netif_carrier_[on|off] from et131x_mii_check Mark Einon
2011-09-04 10:24 ` [PATCH 06/12] staging: et131x: Remove registry_rx_mem_end from struct et131x_adapter Mark Einon
2011-09-04 10:24 ` [PATCH 07/12] staging: et131x: Remove cached_mask_value from et131x_adapter Mark Einon
2011-09-04 10:24 ` [PATCH 08/12] staging: et131x: Remove duplicated register defines from et1310_phy.h Mark Einon
2011-09-04 10:24 ` [PATCH 09/12] staging: et131x: Replace magic numbers in et1310_phy.c with defines Mark Einon
2011-09-04 10:24 ` [PATCH 10/12] staging: et131x: Remove struct mi_regs from et1310_phy.h Mark Einon
2011-09-04 10:24 ` [PATCH 11/12] staging: et131x: Remove ai_force_[duplex|speed] from et131x_adapter Mark Einon
2011-09-04 10:24 ` [PATCH 12/12] staging: et131x: Update README file Mark Einon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1315131883-11068-5-git-send-email-mark.einon@gmail.com \
--to=mark.einon@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=o.hartmann@telovital.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.