[U-Boot] [PATCH] net: phy: micrel: Fix error handling

[U-Boot] [PATCH] net: phy: micrel: Fix error handling

[Marek Vasut]

Fix the following error, the $ret variable handling must
be part of the loop, while due to the missing parenthesis
it was not.

drivers/net/phy/micrel.c: In function ?ksz9021_of_config?:
drivers/net/phy/micrel.c:303:2: warning: this ?for? clause does not guard... [-Wmisleading-indentation]
  for (i = 0; i < ARRAY_SIZE(ofcfg); i++)
  ^~~
drivers/net/phy/micrel.c:305:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ?for?
   if (ret)
   ^~
drivers/net/phy/micrel.c: In function ?ksz9031_of_config?:
drivers/net/phy/micrel.c:411:2: warning: this ?for? clause does not guard... [-Wmisleading-indentation]
  for (i = 0; i < ARRAY_SIZE(ofcfg); i++)
  ^~~
drivers/net/phy/micrel.c:413:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ?for?
   if (ret)
   ^~

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Joe Hershberger <joe.hershberger@ni.com>
---
 drivers/net/phy/micrel.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 28a1401..7163fa2 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -300,10 +300,11 @@ static int ksz9021_of_config(struct phy_device *phydev)
 	};
 	int i, ret = 0;
 
-	for (i = 0; i < ARRAY_SIZE(ofcfg); i++)
+	for (i = 0; i < ARRAY_SIZE(ofcfg); i++) {
 		ret = ksz90x1_of_config_group(phydev, &(ofcfg[i]));
 		if (ret)
 			return ret;
+	}
 
 	return 0;
 }
@@ -408,10 +409,11 @@ static int ksz9031_of_config(struct phy_device *phydev)
 	};
 	int i, ret = 0;
 
-	for (i = 0; i < ARRAY_SIZE(ofcfg); i++)
+	for (i = 0; i < ARRAY_SIZE(ofcfg); i++) {
 		ret = ksz90x1_of_config_group(phydev, &(ofcfg[i]));
 		if (ret)
 			return ret;
+	}
 
 	return 0;
 }
-- 
2.10.2

[U-Boot] [PATCH] net: phy: micrel: Fix error handling

[Joe Hershberger]

On Mon, Nov 14, 2016 at 8:08 AM, Marek Vasut <marex@denx.de> wrote:
> Fix the following error, the $ret variable handling must
> be part of the loop, while due to the missing parenthesis
> it was not.
>
> drivers/net/phy/micrel.c: In function ?ksz9021_of_config?:
> drivers/net/phy/micrel.c:303:2: warning: this ?for? clause does not guard... [-Wmisleading-indentation]
>   for (i = 0; i < ARRAY_SIZE(ofcfg); i++)
>   ^~~
> drivers/net/phy/micrel.c:305:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ?for?
>    if (ret)
>    ^~
> drivers/net/phy/micrel.c: In function ?ksz9031_of_config?:
> drivers/net/phy/micrel.c:411:2: warning: this ?for? clause does not guard... [-Wmisleading-indentation]
>   for (i = 0; i < ARRAY_SIZE(ofcfg); i++)
>   ^~~
> drivers/net/phy/micrel.c:413:3: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ?for?
>    if (ret)
>    ^~
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Joe Hershberger <joe.hershberger@ni.com>

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

> ---
>  drivers/net/phy/micrel.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
> index 28a1401..7163fa2 100644
> --- a/drivers/net/phy/micrel.c
> +++ b/drivers/net/phy/micrel.c
> @@ -300,10 +300,11 @@ static int ksz9021_of_config(struct phy_device *phydev)
>         };
>         int i, ret = 0;
>
> -       for (i = 0; i < ARRAY_SIZE(ofcfg); i++)
> +       for (i = 0; i < ARRAY_SIZE(ofcfg); i++) {
>                 ret = ksz90x1_of_config_group(phydev, &(ofcfg[i]));
>                 if (ret)
>                         return ret;
> +       }

Yikes! Nice catch. :/

>         return 0;
>  }
> @@ -408,10 +409,11 @@ static int ksz9031_of_config(struct phy_device *phydev)
>         };
>         int i, ret = 0;
>
> -       for (i = 0; i < ARRAY_SIZE(ofcfg); i++)
> +       for (i = 0; i < ARRAY_SIZE(ofcfg); i++) {
>                 ret = ksz90x1_of_config_group(phydev, &(ofcfg[i]));
>                 if (ret)
>                         return ret;
> +       }
>
>         return 0;
>  }
> --
> 2.10.2
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot

[U-Boot] net: phy: micrel: Fix error handling

[Joe Hershberger]

Hi Marek,

https://patchwork.ozlabs.org/patch/694537/ was applied to u-boot-net.git.

Thanks!
-Joe