atheros: do not assignment in if condition

[openwrt/svn-archive/archive.git] / target / linux / atheros / patches-3.10 / 220-enet_micrel_workaround.patch

diff --git a/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
index da86857213a6c37202f648f0f2e891ae45f5375c..35344ca73aefc9648b56df5278fe6fe379dbb4f8 100644 (file)
--- a/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
+++ b/target/linux/atheros/patches-3.10/220-enet_micrel_workaround.patch
@@ -8,7 +8,7 @@
  
  #ifndef ERR
  #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args)
-@@ -182,6 +183,30 @@ static const struct net_device_ops ar231
+@@ -182,6 +183,32 @@ static const struct net_device_ops ar231
  #endif
  };
  
@@ -16,8 +16,10 @@
 +{
 +      int phy_reg;
 +
-+      /* Grab the bits from PHYIR1, and put them
-+       * in the upper half */
++      /**
++       * Grab the bits from PHYIR1, and put them
++       * in the upper half.
++       */
 +      phy_reg = mdiobus_read(bus, addr, MII_PHYSID1);
 +
 +      if (phy_reg < 0)
@@ -39,12 +41,14 @@
  int ar231x_probe(struct platform_device *pdev)
  {
        struct net_device *dev;
-@@ -299,6 +324,21 @@ int ar231x_probe(struct platform_device
+@@ -297,6 +324,23 @@ int ar231x_probe(struct platform_device
  
        mdiobus_register(sp->mii_bus);
  
-+      /* Workaround for Micrel switch, which is only available on
-+       * one PHY and cannot be configured through MDIO */
++      /**
++       * Workaround for Micrel switch, which is only available on
++       * one PHY and cannot be configured through MDIO.
++       */
 +      if (!no_phy) {
 +              u32 phy_id = 0;
 +              get_phy_id(sp->mii_bus, 1, &phy_id);
@@ -61,7 +65,7 @@
        if (ar231x_mdiobus_probe(dev) != 0) {
                printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name);
                rx_tasklet_cleanup(dev);
-@@ -355,8 +395,10 @@ static int ar231x_remove(struct platform
+@@ -353,8 +397,10 @@ static int ar231x_remove(struct platform
        rx_tasklet_cleanup(dev);
        ar231x_init_cleanup(dev);
        unregister_netdev(dev);
@@ -74,7 +78,7 @@
        kfree(dev);
        return 0;
  }
-@@ -1132,6 +1174,9 @@ static int ar231x_ioctl(struct net_devic
+@@ -1120,6 +1166,9 @@ static int ar231x_ioctl(struct net_devic
        struct ar231x_private *sp = netdev_priv(dev);
        int ret;