From: Chuanhong Guo <gch981213@gmail.com>
Date: Thu, 10 Jan 2019 05:05:00 +0000 (+0800)
Subject: generic: ar8216: move chip id reading into a separate function
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=15323c4ef8cce5c127c250d93f7ea09a33cb9dd6;p=openwrt%2Fstaging%2Fxback.git

generic: ar8216: move chip id reading into a separate function

for mdio-device probing we still need to read chip id but ar8xxx_chip
can be determined using drvdata. We can't distinguish the buggy
standalone ar8216 and the builtin ar8216 in ar724x/ar933x using chip
id.

Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
---

diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index 2f0be1b8da..2c111c2b81 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -1813,7 +1813,7 @@ static const struct ar8xxx_chip ar8316_chip = {
 };
 
 static int
-ar8xxx_id_chip(struct ar8xxx_priv *priv)
+ar8xxx_read_id(struct ar8xxx_priv *priv)
 {
 	u32 val;
 	u16 id;
@@ -1838,6 +1838,17 @@ ar8xxx_id_chip(struct ar8xxx_priv *priv)
 
 	priv->chip_ver = (id & AR8216_CTRL_VERSION) >> AR8216_CTRL_VERSION_S;
 	priv->chip_rev = (id & AR8216_CTRL_REVISION);
+	return 0;
+}
+
+static int
+ar8xxx_id_chip(struct ar8xxx_priv *priv)
+{
+	int ret;
+
+	ret = ar8xxx_read_id(priv);
+	if(ret)
+		return ret;
 
 	switch (priv->chip_ver) {
 	case AR8XXX_VER_AR8216: