malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mark Einon 2011-10-01 11:14:12 +01:00 committed by Greg Kroah-Hartman
parent a3bf5fa772
commit 1ce664dc01
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/et131x/et1310_phy.c
View File

@ -337,9 +337,6 @@ void et131x_xcvr_init(struct et131x_adapter *adapter)
u16 isr;
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_MASK, &imr);

3
drivers/staging/et131x/et131x_adapter.h
View File

@ -201,9 +201,6 @@ struct et131x_adapter {
u16 pdown_speed;
u8 pdown_duplex;
/* Xcvr status at last poll */
u16 bmsr;
/* Tx Memory Variables */
struct tx_ring tx_ring;

7
drivers/staging/et131x/et131x_initpci.c
View File

@ -239,19 +239,18 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
void et131x_error_timer_handler(unsigned long data)
{
struct et131x_adapter *adapter = (struct et131x_adapter *) data;
struct phy_device *phydev = adapter->phydev;
if (!et1310_in_phy_coma(adapter))
et1310_update_macstat_host_counters(adapter);
else
dev_err(&adapter->pdev->dev, "No interrupts, in PHY coma\n");
if (!(adapter->bmsr & BMSR_LSTATUS) &&
adapter->boot_coma < 11) {
if (!phydev->link && adapter->boot_coma < 11)
adapter->boot_coma++;
}
if (adapter->boot_coma == 10) {
if (!(adapter->bmsr & BMSR_LSTATUS)) {
if (!phydev->link) {
if (!et1310_in_phy_coma(adapter)) {
/* NOTE - This was originally a 'sync with
* interrupt'. How to do that under Linux?