Commit 1ce664dc authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman

staging: et131x: Remove adapter->bmsr, replace with phydev equivalents

adapter->bmsr is no longer being updated, but is also used to check the link state in places.

Remove bmsr from adapter, and replace link state checks with phydev->link check.
Signed-off-by: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a3bf5fa7
...@@ -337,9 +337,6 @@ void et131x_xcvr_init(struct et131x_adapter *adapter) ...@@ -337,9 +337,6 @@ void et131x_xcvr_init(struct et131x_adapter *adapter)
u16 isr; u16 isr;
u16 lcr2; u16 lcr2;
/* Zero out the adapter structure variable representing BMSR */
adapter->bmsr = 0;
et131x_mii_read(adapter, PHY_INTERRUPT_STATUS, &isr); et131x_mii_read(adapter, PHY_INTERRUPT_STATUS, &isr);
et131x_mii_read(adapter, PHY_INTERRUPT_MASK, &imr); et131x_mii_read(adapter, PHY_INTERRUPT_MASK, &imr);
......
...@@ -201,9 +201,6 @@ struct et131x_adapter { ...@@ -201,9 +201,6 @@ struct et131x_adapter {
u16 pdown_speed; u16 pdown_speed;
u8 pdown_duplex; u8 pdown_duplex;
/* Xcvr status at last poll */
u16 bmsr;
/* Tx Memory Variables */ /* Tx Memory Variables */
struct tx_ring tx_ring; struct tx_ring tx_ring;
......
...@@ -239,19 +239,18 @@ static int et131x_pci_init(struct et131x_adapter *adapter, ...@@ -239,19 +239,18 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
void et131x_error_timer_handler(unsigned long data) void et131x_error_timer_handler(unsigned long data)
{ {
struct et131x_adapter *adapter = (struct et131x_adapter *) data; struct et131x_adapter *adapter = (struct et131x_adapter *) data;
struct phy_device *phydev = adapter->phydev;
if (!et1310_in_phy_coma(adapter)) if (!et1310_in_phy_coma(adapter))
et1310_update_macstat_host_counters(adapter); et1310_update_macstat_host_counters(adapter);
else else
dev_err(&adapter->pdev->dev, "No interrupts, in PHY coma\n"); dev_err(&adapter->pdev->dev, "No interrupts, in PHY coma\n");
if (!(adapter->bmsr & BMSR_LSTATUS) && if (!phydev->link && adapter->boot_coma < 11)
adapter->boot_coma < 11) {
adapter->boot_coma++; adapter->boot_coma++;
}
if (adapter->boot_coma == 10) { if (adapter->boot_coma == 10) {
if (!(adapter->bmsr & BMSR_LSTATUS)) { if (!phydev->link) {
if (!et1310_in_phy_coma(adapter)) { if (!et1310_in_phy_coma(adapter)) {
/* NOTE - This was originally a 'sync with /* NOTE - This was originally a 'sync with
* interrupt'. How to do that under Linux? * interrupt'. How to do that under Linux?
......
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