mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
net: bcmgenet: Remove checks on clock handles
Instead of multiplying the number of checks for IS_ERR(priv->clk), simply NULLify the 'struct clk' pointer which is something the Linux common clock framework perfectly deals with and does early return for each and every single clk_* API functions. Having every single function check for !IS_ERR(priv->clk) is both redundant and error prone, as it turns out, we were doing it for the main GENET clock: priv->clk, but not for the Wake-on-LAN or EEE clock, so let's just be consistent here. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Acked-by: Petri Gynther <pgynther@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
b3e6b82a00
commit
7d5d3075b5
1 changed files with 12 additions and 14 deletions
|
@ -2625,7 +2625,6 @@ static int bcmgenet_open(struct net_device *dev)
|
|||
netif_dbg(priv, ifup, dev, "bcmgenet_open\n");
|
||||
|
||||
/* Turn on the clock */
|
||||
if (!IS_ERR(priv->clk))
|
||||
clk_prepare_enable(priv->clk);
|
||||
|
||||
/* If this is an internal GPHY, power it back on now, before UniMAC is
|
||||
|
@ -2703,7 +2702,6 @@ static int bcmgenet_open(struct net_device *dev)
|
|||
err_fini_dma:
|
||||
bcmgenet_fini_dma(priv);
|
||||
err_clk_disable:
|
||||
if (!IS_ERR(priv->clk))
|
||||
clk_disable_unprepare(priv->clk);
|
||||
return ret;
|
||||
}
|
||||
|
@ -2761,7 +2759,6 @@ static int bcmgenet_close(struct net_device *dev)
|
|||
if (priv->internal_phy)
|
||||
ret = bcmgenet_power_down(priv, GENET_POWER_PASSIVE);
|
||||
|
||||
if (!IS_ERR(priv->clk))
|
||||
clk_disable_unprepare(priv->clk);
|
||||
|
||||
return ret;
|
||||
|
@ -3215,10 +3212,11 @@ static int bcmgenet_probe(struct platform_device *pdev)
|
|||
priv->version = pd->genet_version;
|
||||
|
||||
priv->clk = devm_clk_get(&priv->pdev->dev, "enet");
|
||||
if (IS_ERR(priv->clk))
|
||||
if (IS_ERR(priv->clk)) {
|
||||
dev_warn(&priv->pdev->dev, "failed to get enet clock\n");
|
||||
priv->clk = NULL;
|
||||
}
|
||||
|
||||
if (!IS_ERR(priv->clk))
|
||||
clk_prepare_enable(priv->clk);
|
||||
|
||||
bcmgenet_set_hw_params(priv);
|
||||
|
@ -3230,8 +3228,10 @@ static int bcmgenet_probe(struct platform_device *pdev)
|
|||
INIT_WORK(&priv->bcmgenet_irq_work, bcmgenet_irq_task);
|
||||
|
||||
priv->clk_wol = devm_clk_get(&priv->pdev->dev, "enet-wol");
|
||||
if (IS_ERR(priv->clk_wol))
|
||||
if (IS_ERR(priv->clk_wol)) {
|
||||
dev_warn(&priv->pdev->dev, "failed to get enet-wol clock\n");
|
||||
priv->clk_wol = NULL;
|
||||
}
|
||||
|
||||
priv->clk_eee = devm_clk_get(&priv->pdev->dev, "enet-eee");
|
||||
if (IS_ERR(priv->clk_eee)) {
|
||||
|
@ -3257,7 +3257,6 @@ static int bcmgenet_probe(struct platform_device *pdev)
|
|||
netif_carrier_off(dev);
|
||||
|
||||
/* Turn off the main clock, WOL clock is handled separately */
|
||||
if (!IS_ERR(priv->clk))
|
||||
clk_disable_unprepare(priv->clk);
|
||||
|
||||
err = register_netdev(dev);
|
||||
|
@ -3267,7 +3266,6 @@ static int bcmgenet_probe(struct platform_device *pdev)
|
|||
return err;
|
||||
|
||||
err_clk_disable:
|
||||
if (!IS_ERR(priv->clk))
|
||||
clk_disable_unprepare(priv->clk);
|
||||
err:
|
||||
free_netdev(dev);
|
||||
|
|
Loading…
Reference in a new issue