From 5e0f4e5bfcb16dd4548425459a8cec9113a8f405 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 26 Jun 2010 19:16:06 +0000
Subject: [PATCH] generic: rtl8366: use struct rtl8366_smi for
 phy_reg_{read,write} calls

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21912 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../files/drivers/net/phy/rtl8366rb.c            | 16 +++++++---------
 .../generic-2.6/files/drivers/net/phy/rtl8366s.c | 16 +++++++---------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
index d453fa497..7125bb8aa 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366rb.c
@@ -257,10 +257,9 @@ static int rtl8366rb_reset_chip(struct rtl8366rb *rtl)
 	return 0;
 }
 
-static int rtl8366rb_read_phy_reg(struct rtl8366rb *rtl,
+static int rtl8366rb_read_phy_reg(struct rtl8366_smi *smi,
 				 u32 phy_no, u32 page, u32 addr, u32 *data)
 {
-	struct rtl8366_smi *smi = &rtl->smi;
 	u32 reg;
 	int ret;
 
@@ -293,10 +292,9 @@ static int rtl8366rb_read_phy_reg(struct rtl8366rb *rtl,
 	return 0;
 }
 
-static int rtl8366rb_write_phy_reg(struct rtl8366rb *rtl,
+static int rtl8366rb_write_phy_reg(struct rtl8366_smi *smi,
 				  u32 phy_no, u32 page, u32 addr, u32 data)
 {
-	struct rtl8366_smi *smi = &rtl->smi;
 	u32 reg;
 	int ret;
 
@@ -1502,11 +1500,11 @@ static void rtl8366rb_switch_cleanup(struct rtl8366rb *rtl)
 
 static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)
 {
-	struct rtl8366rb *rtl = smi_to_rtl8366rb(bus->priv);
+	struct rtl8366_smi *smi = bus->priv;
 	u32 val = 0;
 	int err;
 
-	err = rtl8366rb_read_phy_reg(rtl, addr, 0, reg, &val);
+	err = rtl8366rb_read_phy_reg(smi, addr, 0, reg, &val);
 	if (err)
 		return 0xffff;
 
@@ -1515,13 +1513,13 @@ static int rtl8366rb_mii_read(struct mii_bus *bus, int addr, int reg)
 
 static int rtl8366rb_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
 {
-	struct rtl8366rb *rtl = smi_to_rtl8366rb(bus->priv);
+	struct rtl8366_smi *smi = bus->priv;
 	u32 t;
 	int err;
 
-	err = rtl8366rb_write_phy_reg(rtl, addr, 0, reg, val);
+	err = rtl8366rb_write_phy_reg(smi, addr, 0, reg, val);
 	/* flush write */
-	(void) rtl8366rb_read_phy_reg(rtl, addr, 0, reg, &t);
+	(void) rtl8366rb_read_phy_reg(smi, addr, 0, reg, &t);
 
 	return err;
 }
diff --git a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
index 9f378657f..2af32eee4 100644
--- a/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
+++ b/target/linux/generic-2.6/files/drivers/net/phy/rtl8366s.c
@@ -257,10 +257,9 @@ static int rtl8366s_reset_chip(struct rtl8366s *rtl)
 	return 0;
 }
 
-static int rtl8366s_read_phy_reg(struct rtl8366s *rtl,
+static int rtl8366s_read_phy_reg(struct rtl8366_smi *smi,
 				 u32 phy_no, u32 page, u32 addr, u32 *data)
 {
-	struct rtl8366_smi *smi = &rtl->smi;
 	u32 reg;
 	int ret;
 
@@ -293,10 +292,9 @@ static int rtl8366s_read_phy_reg(struct rtl8366s *rtl,
 	return 0;
 }
 
-static int rtl8366s_write_phy_reg(struct rtl8366s *rtl,
+static int rtl8366s_write_phy_reg(struct rtl8366_smi *smi,
 				  u32 phy_no, u32 page, u32 addr, u32 data)
 {
-	struct rtl8366_smi *smi = &rtl->smi;
 	u32 reg;
 	int ret;
 
@@ -1471,11 +1469,11 @@ static void rtl8366s_switch_cleanup(struct rtl8366s *rtl)
 
 static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
 {
-	struct rtl8366s *rtl = smi_to_rtl8366s(bus->priv);
+	struct rtl8366_smi *smi = bus->priv;
 	u32 val = 0;
 	int err;
 
-	err = rtl8366s_read_phy_reg(rtl, addr, 0, reg, &val);
+	err = rtl8366s_read_phy_reg(smi, addr, 0, reg, &val);
 	if (err)
 		return 0xffff;
 
@@ -1484,13 +1482,13 @@ static int rtl8366s_mii_read(struct mii_bus *bus, int addr, int reg)
 
 static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
 {
-	struct rtl8366s *rtl = smi_to_rtl8366s(bus->priv);
+	struct rtl8366_smi *smi = bus->priv;
 	u32 t;
 	int err;
 
-	err = rtl8366s_write_phy_reg(rtl, addr, 0, reg, val);
+	err = rtl8366s_write_phy_reg(smi, addr, 0, reg, val);
 	/* flush write */
-	(void) rtl8366s_read_phy_reg(rtl, addr, 0, reg, &t);
+	(void) rtl8366s_read_phy_reg(smi, addr, 0, reg, &t);
 
 	return err;
 }
-- 
2.20.1