ar71xx: fix sections mismatch warnings in the nand drivers

[openwrt.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_phy.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
index eada693..b10dd49 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
@@ -48,9 +48,9 @@ void ag71xx_phy_start(struct ag71xx *ag)
 
        if (ag->phy_dev) {
                phy_start(ag->phy_dev);
+       } else if (pdata->switch_data) {
+               ag71xx_ar7240_start(ag);
        } else {
-               if (pdata->has_ar7240_switch)
-                       ag71xx_ar7240_start(ag);
                ag->link = 1;
                ag71xx_link_adjust(ag);
        }
@@ -59,15 +59,19 @@ void ag71xx_phy_start(struct ag71xx *ag)
 void ag71xx_phy_stop(struct ag71xx *ag)
 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+       unsigned long flags;
 
-       if (ag->phy_dev) {
+       if (ag->phy_dev)
                phy_stop(ag->phy_dev);
-       } else {
-               if (pdata->has_ar7240_switch)
-                       ag71xx_ar7240_stop(ag);
+       else if (pdata->switch_data)
+               ag71xx_ar7240_stop(ag);
+
+       spin_lock_irqsave(&ag->lock, flags);
+       if (ag->link) {
                ag->link = 0;
                ag71xx_link_adjust(ag);
        }
+       spin_unlock_irqrestore(&ag->lock, flags);
 }
 
 static int ag71xx_phy_connect_fixed(struct ag71xx *ag)
@@ -190,10 +194,14 @@ static struct mii_bus *dev_to_mii_bus(struct device *dev)
        return NULL;
 }
 
-int ag71xx_phy_connect(struct ag71xx *ag)
+int __devinit ag71xx_phy_connect(struct ag71xx *ag)
 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 
+       if (pdata->mii_bus_dev == NULL ||
+           pdata->mii_bus_dev->bus == NULL )
+               return ag71xx_phy_connect_fixed(ag);
+
        ag->mii_bus = dev_to_mii_bus(pdata->mii_bus_dev);
        if (ag->mii_bus == NULL) {
                printk(KERN_ERR "%s: unable to find MII bus on device '%s'\n",
@@ -208,7 +216,7 @@ int ag71xx_phy_connect(struct ag71xx *ag)
                mutex_unlock(&ag->mii_bus->mdio_lock);
        }
 
-       if (pdata->has_ar7240_switch)
+       if (pdata->switch_data)
                return ag71xx_ar7240_init(ag);
 
        if (pdata->phy_mask)
@@ -221,7 +229,7 @@ void ag71xx_phy_disconnect(struct ag71xx *ag)
 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 
-       if (pdata->has_ar7240_switch)
+       if (pdata->switch_data)
                ag71xx_ar7240_cleanup(ag);
        else if (ag->phy_dev)
                phy_disconnect(ag->phy_dev);