2021-02-06 20:18:40

by Phillip Potter

[permalink] [raw]
Subject: [PATCH] staging: octeon: remove braces from single-line block

This removes the braces from the if statement that checks the
physical node return value in cvm_oct_phy_setup_device, as this
block contains only one statement. Fixes a style warning.

Signed-off-by: Phillip Potter <[email protected]>
---
drivers/staging/octeon/ethernet-mdio.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
index 0bf545849b11..b0fd083a5bf2 100644
--- a/drivers/staging/octeon/ethernet-mdio.c
+++ b/drivers/staging/octeon/ethernet-mdio.c
@@ -146,9 +146,8 @@ int cvm_oct_phy_setup_device(struct net_device *dev)
goto no_phy;

phy_node = of_parse_phandle(priv->of_node, "phy-handle", 0);
- if (!phy_node && of_phy_is_fixed_link(priv->of_node)) {
+ if (!phy_node && of_phy_is_fixed_link(priv->of_node))
phy_node = of_node_get(priv->of_node);
- }
if (!phy_node)
goto no_phy;

--
2.29.2


2021-02-08 07:17:11

by Alexander Sverdlin

[permalink] [raw]
Subject: Re: [PATCH] staging: octeon: remove braces from single-line block

Hi!

On 06/02/2021 21:17, Phillip Potter wrote:
> This removes the braces from the if statement that checks the
> physical node return value in cvm_oct_phy_setup_device, as this
> block contains only one statement. Fixes a style warning.
>
> Signed-off-by: Phillip Potter <[email protected]>

Reviewed-by: Alexander Sverdlin <[email protected]>

> ---
> drivers/staging/octeon/ethernet-mdio.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
> index 0bf545849b11..b0fd083a5bf2 100644
> --- a/drivers/staging/octeon/ethernet-mdio.c
> +++ b/drivers/staging/octeon/ethernet-mdio.c
> @@ -146,9 +146,8 @@ int cvm_oct_phy_setup_device(struct net_device *dev)
> goto no_phy;
>
> phy_node = of_parse_phandle(priv->of_node, "phy-handle", 0);
> - if (!phy_node && of_phy_is_fixed_link(priv->of_node)) {
> + if (!phy_node && of_phy_is_fixed_link(priv->of_node))
> phy_node = of_node_get(priv->of_node);
> - }
> if (!phy_node)
> goto no_phy;
>

--
Best regards,
Alexander Sverdlin.

2021-02-08 12:11:55

by Phillip Potter

[permalink] [raw]
Subject: Re: [PATCH] staging: octeon: remove braces from single-line block

On Mon, Feb 08, 2021 at 08:14:02AM +0100, Alexander Sverdlin wrote:
> Hi!
>
> On 06/02/2021 21:17, Phillip Potter wrote:
> > This removes the braces from the if statement that checks the
> > physical node return value in cvm_oct_phy_setup_device, as this
> > block contains only one statement. Fixes a style warning.
> >
> > Signed-off-by: Phillip Potter <[email protected]>
>
> Reviewed-by: Alexander Sverdlin <[email protected]>
>

Thank you Alexander.

> > ---
> > drivers/staging/octeon/ethernet-mdio.c | 3 +--
> > 1 file changed, 1 insertion(+), 2 deletions(-)
> >
> > diff --git a/drivers/staging/octeon/ethernet-mdio.c b/drivers/staging/octeon/ethernet-mdio.c
> > index 0bf545849b11..b0fd083a5bf2 100644
> > --- a/drivers/staging/octeon/ethernet-mdio.c
> > +++ b/drivers/staging/octeon/ethernet-mdio.c
> > @@ -146,9 +146,8 @@ int cvm_oct_phy_setup_device(struct net_device *dev)
> > goto no_phy;
> >
> > phy_node = of_parse_phandle(priv->of_node, "phy-handle", 0);
> > - if (!phy_node && of_phy_is_fixed_link(priv->of_node)) {
> > + if (!phy_node && of_phy_is_fixed_link(priv->of_node))
> > phy_node = of_node_get(priv->of_node);
> > - }
> > if (!phy_node)
> > goto no_phy;
> >
>
> --
> Best regards,
> Alexander Sverdlin.

Regards,
Phil Potter