diff options
| author | Mark Einon <mark.einon@gmail.com> | 2011-08-30 11:47:23 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 23:49:28 (GMT) |
| commit | f660732fdcf2b7eaf3ebfd9f7b6bc921837536f5 (patch) | |
| tree | ee9701af7d9d762a3de9ef8ba75c2659c90199fa /drivers/staging/et131x/et131x_initpci.c | |
| parent | f6807514910f2d3c9d19e2cdd369a31aade73e6f (diff) | |
| download | linux-f660732fdcf2b7eaf3ebfd9f7b6bc921837536f5.tar.xz | |
staging: et131x: Remove xcvr_addr and et131x_xcvr_find
Use the phy_device equivalents instead.
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_initpci.c')
| -rw-r--r-- | drivers/staging/et131x/et131x_initpci.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index fbbef76..66cf1ce 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c @@ -328,10 +328,8 @@ void et131x_configure_global_regs(struct et131x_adapter *adapter) * * Returns 0 on success, errno on failure (as defined in errno.h) */ -int et131x_adapter_setup(struct et131x_adapter *adapter) +void et131x_adapter_setup(struct et131x_adapter *adapter) { - int status; - /* Configure the JAGCore */ et131x_configure_global_regs(adapter); @@ -349,12 +347,6 @@ int et131x_adapter_setup(struct et131x_adapter *adapter) et1310_config_macstat_regs(adapter); - /* Move the following code to Timer function?? */ - status = et131x_xcvr_find(adapter); - - if (status) - dev_warn(&adapter->pdev->dev, "Could not find the xcvr\n"); - /* Prepare the TRUEPHY library. */ et1310_phy_init(adapter); @@ -377,7 +369,6 @@ int et131x_adapter_setup(struct et131x_adapter *adapter) et1310_phy_power_down(adapter, 0); et131x_setphy_normal(adapter); - return status; } /** @@ -493,9 +484,7 @@ static void et131x_adjust_link(struct net_device *netdev) et1310_disable_phy_coma(adapter); } - et131x_mii_read(adapter, - (uint8_t) offsetof(struct mi_regs, bmsr), - &bmsr_data); + et131x_phy_mii_read(adapter, phydev->addr, MII_BMSR, &bmsr_data); bmsr_ints = adapter->bmsr ^ bmsr_data; adapter->bmsr = bmsr_data; |