[PATCH] net: PHY: bcm-unimac: Fix clock handling

[PATCH] net: PHY: bcm-unimac: Fix clock handling

[Andre Przywara]

The DT binding for this PHY describes an *optional* clock property.
Due to a bug in the error handling logic, we are actually ignoring this
clock *all* of the time so far.

Fix this by using devm_clk_get_optional() to handle this clock properly.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
---
 drivers/net/phy/mdio-bcm-unimac.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/mdio-bcm-unimac.c b/drivers/net/phy/mdio-bcm-unimac.c
index 4a28fb29adaa..fbd36891ee64 100644
--- a/drivers/net/phy/mdio-bcm-unimac.c
+++ b/drivers/net/phy/mdio-bcm-unimac.c
@@ -242,11 +242,9 @@ static int unimac_mdio_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
-	priv->clk = devm_clk_get(&pdev->dev, NULL);
-	if (PTR_ERR(priv->clk) == -EPROBE_DEFER)
+	priv->clk = devm_clk_get_optional(&pdev->dev, NULL);
+	if (IS_ERR(priv->clk))
 		return PTR_ERR(priv->clk);
-	else
-		priv->clk = NULL;
 
 	ret = clk_prepare_enable(priv->clk);
 	if (ret)
-- 
2.17.1

Re: [PATCH] net: PHY: bcm-unimac: Fix clock handling

[Andrew Lunn]

On Tue, Mar 24, 2020 at 04:10:10PM +0000, Andre Przywara wrote:
> The DT binding for this PHY describes an *optional* clock property.
> Due to a bug in the error handling logic, we are actually ignoring this
> clock *all* of the time so far.
> 
> Fix this by using devm_clk_get_optional() to handle this clock properly.
> 
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>

Hi Andre

Do you have a fixes: tag for this?

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

Re: [PATCH] net: PHY: bcm-unimac: Fix clock handling

[André Przywara]

On 24/03/2020 16:17, Andrew Lunn wrote:

Hi,

> On Tue, Mar 24, 2020 at 04:10:10PM +0000, Andre Przywara wrote:
>> The DT binding for this PHY describes an *optional* clock property.
>> Due to a bug in the error handling logic, we are actually ignoring this
>> clock *all* of the time so far.
>>
>> Fix this by using devm_clk_get_optional() to handle this clock properly.
>>
>> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
> 
> Hi Andre
> 
> Do you have a fixes: tag for this?

Should be:
Fixes: b78ac6ecd1b6b ("net: phy: mdio-bcm-unimac: Allow configuring MDIO
clock divider")

> Reviewed-by: Andrew Lunn <andrew@lunn.ch>

Thanks for that!

Cheers,
Andre

Re: [PATCH] net: PHY: bcm-unimac: Fix clock handling

[Florian Fainelli]

On 3/24/2020 9:26 AM, André Przywara wrote:
> On 24/03/2020 16:17, Andrew Lunn wrote:
> 
> Hi,
> 
>> On Tue, Mar 24, 2020 at 04:10:10PM +0000, Andre Przywara wrote:
>>> The DT binding for this PHY describes an *optional* clock property.
>>> Due to a bug in the error handling logic, we are actually ignoring this
>>> clock *all* of the time so far.
>>>
>>> Fix this by using devm_clk_get_optional() to handle this clock properly.
>>>
>>> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
>>
>> Hi Andre
>>
>> Do you have a fixes: tag for this?
> 
> Should be:
> Fixes: b78ac6ecd1b6b ("net: phy: mdio-bcm-unimac: Allow configuring MDIO
> clock divider")
> 
>> Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> 
> Thanks for that!

And the subject should be:

net: phy: mdio-bcm-unimac: Fix clock handling

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH] net: PHY: bcm-unimac: Fix clock handling

[David Miller]

From: Andre Przywara <andre.przywara@arm.com>
Date: Tue, 24 Mar 2020 16:10:10 +0000

> The DT binding for this PHY describes an *optional* clock property.
> Due to a bug in the error handling logic, we are actually ignoring this
> clock *all* of the time so far.
> 
> Fix this by using devm_clk_get_optional() to handle this clock properly.
> 
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>

Applied with Fixes tag added and Subject line corrected.

Thanks.