X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric-2.6%2Ffiles%2Fdrivers%2Fnet%2Fphy%2Frtl8366s.c;fp=target%2Flinux%2Fgeneric-2.6%2Ffiles%2Fdrivers%2Fnet%2Fphy%2Frtl8366s.c;h=e2d8402cf67f33a1b76d3fb03859c8b628281f08;hp=eb8f4b469185fd9c1d07b6319e68533553a3d8f4;hb=0c3162a2dd2aea6b787ca757c42f3875d2f3771a;hpb=83623000f47ca99ab552350629ce0c53f866f24f

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 eb8f4b469..e2d8402cf 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
@@ -25,7 +25,6 @@
 #define RTL8366S_PHY_NO_MAX	4
 #define RTL8366S_PHY_PAGE_MAX	7
 #define RTL8366S_PHY_ADDR_MAX	31
-#define RTL8366S_PHY_WAN	4
 
 /* Switch Global Configuration register */
 #define RTL8366S_SGCR				0x0000
@@ -986,12 +985,6 @@ static int rtl8366s_mii_write(struct mii_bus *bus, int addr, int reg, u16 val)
 	return err;
 }
 
-static int rtl8366s_mii_bus_match(struct mii_bus *bus)
-{
-	return (bus->read == rtl8366s_mii_read &&
-		bus->write == rtl8366s_mii_write);
-}
-
 static int rtl8366s_setup(struct rtl8366_smi *smi)
 {
 	int ret;
@@ -1111,36 +1104,6 @@ static int __devinit rtl8366s_probe(struct platform_device *pdev)
 	return err;
 }
 
-static int rtl8366s_phy_config_init(struct phy_device *phydev)
-{
-	if (!rtl8366s_mii_bus_match(phydev->bus))
-		return -EINVAL;
-
-	return 0;
-}
-
-static int rtl8366s_phy_config_aneg(struct phy_device *phydev)
-{
-	/* phy 4 might be connected to a second mac, allow aneg config */
-	if (phydev->addr == RTL8366S_PHY_WAN)
-		return genphy_config_aneg(phydev);
-
-	return 0;
-}
-
-static struct phy_driver rtl8366s_phy_driver = {
-	.phy_id		= 0x001cc960,
-	.name		= "Realtek RTL8366S",
-	.phy_id_mask	= 0x1ffffff0,
-	.features	= PHY_GBIT_FEATURES,
-	.config_aneg	= rtl8366s_phy_config_aneg,
-	.config_init    = rtl8366s_phy_config_init,
-	.read_status	= genphy_read_status,
-	.driver		= {
-		.owner = THIS_MODULE,
-	},
-};
-
 static int __devexit rtl8366s_remove(struct platform_device *pdev)
 {
 	struct rtl8366_smi *smi = platform_get_drvdata(pdev);
@@ -1166,26 +1129,12 @@ static struct platform_driver rtl8366s_driver = {
 
 static int __init rtl8366s_module_init(void)
 {
-	int ret;
-	ret = platform_driver_register(&rtl8366s_driver);
-	if (ret)
-		return ret;
-
-	ret = phy_driver_register(&rtl8366s_phy_driver);
-	if (ret)
-		goto err_platform_unregister;
-
-	return 0;
-
- err_platform_unregister:
-	platform_driver_unregister(&rtl8366s_driver);
-	return ret;
+	return platform_driver_register(&rtl8366s_driver);
 }
 module_init(rtl8366s_module_init);
 
 static void __exit rtl8366s_module_exit(void)
 {
-	phy_driver_unregister(&rtl8366s_phy_driver);
 	platform_driver_unregister(&rtl8366s_driver);
 }
 module_exit(rtl8366s_module_exit);