hurricos/openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

generic: ar8216: don't use mdio bus specific functions in ar8216_id_chip

Browse Source 
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 35517
This commit is contained in:
Gabor Juhos 2013-02-08 09:13:14 +00:00
parent 5c8783e02a
commit 9c1f95a416
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/generic/files/drivers/net/phy/ar8216.c
View File

@ -1653,7 +1653,7 @@ ar8216_id_chip(struct ar8216_priv *priv)
u16 id; u16 id;
int i; int i;
val = ar8216_mii_read(priv, AR8216_REG_CTRL); val = priv->read(priv, AR8216_REG_CTRL);
if (val == ~0) if (val == ~0)
return -ENODEV; return -ENODEV;
@ -1661,7 +1661,7 @@ ar8216_id_chip(struct ar8216_priv *priv)
for (i = 0; i < AR8X16_PROBE_RETRIES; i++) { for (i = 0; i < AR8X16_PROBE_RETRIES; i++) {
u16 t; u16 t;
val = ar8216_mii_read(priv, AR8216_REG_CTRL); val = priv->read(priv, AR8216_REG_CTRL);
if (val == ~0) if (val == ~0)
return -ENODEV; return -ENODEV;
@ -1689,10 +1689,8 @@ ar8216_id_chip(struct ar8216_priv *priv)
break; break;
default: default:
printk(KERN_DEBUG printk(KERN_DEBUG
"ar8216: Unknown Atheros device [ver=%d, rev=%d, phy_id=%04x%04x]\n", "ar8216: Unknown Atheros device [ver=%d, rev=%d]\n",
priv->chip_ver, priv->chip_rev, priv->chip_ver, priv->chip_rev);
mdiobus_read(priv->mii_bus, priv->phy->addr, 2),
mdiobus_read(priv->mii_bus, priv->phy->addr, 3));
return -ENODEV; return -ENODEV;
} }
@ -1784,6 +1782,9 @@ ar8216_config_init(struct phy_device *pdev)
} }
priv->mii_bus = pdev->bus; priv->mii_bus = pdev->bus;
priv->read = ar8216_mii_read;
priv->write = ar8216_mii_write;
priv->phy = pdev; priv->phy = pdev;
ret = ar8216_id_chip(priv); ret = ar8216_id_chip(priv);
@ -1833,8 +1834,6 @@ ar8216_config_init(struct phy_device *pdev)
pdev->advertising = pdev->supported; pdev->advertising = pdev->supported;
mutex_init(&priv->reg_mutex); mutex_init(&priv->reg_mutex);
priv->read = ar8216_mii_read;
priv->write = ar8216_mii_write;
pdev->priv = priv; pdev->priv = priv;
@ -1972,6 +1971,8 @@ ar8216_probe(struct phy_device *pdev)
return -ENOMEM; return -ENOMEM;
priv->mii_bus = pdev->bus; priv->mii_bus = pdev->bus;
priv->read = ar8216_mii_read;
priv->write = ar8216_mii_write;
priv->phy = pdev; priv->phy = pdev;
ret = ar8216_id_chip(priv); ret = ar8216_id_chip(priv);