mirror of
https://github.com/torvalds/linux
synced 2024-10-19 17:58:44 +00:00
net: dsa: bcm_sf2: simplify optional reset handling
As of commit bb475230b8
("reset: make optional functions really
optional"), the reset framework API calls use NULL pointers to describe
optional, non-present reset controls.
This allows to unconditionally return errors from
devm_reset_control_get_optional_exclusive.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9270bbe258
commit
bf9279cd63
|
@ -406,7 +406,7 @@ static int bcm_sf2_sw_rst(struct bcm_sf2_priv *priv)
|
|||
/* The watchdog reset does not work on 7278, we need to hit the
|
||||
* "external" reset line through the reset controller.
|
||||
*/
|
||||
if (priv->type == BCM7278_DEVICE_ID && !IS_ERR(priv->rcdev)) {
|
||||
if (priv->type == BCM7278_DEVICE_ID) {
|
||||
ret = reset_control_assert(priv->rcdev);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
@ -1265,7 +1265,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev)
|
|||
|
||||
priv->rcdev = devm_reset_control_get_optional_exclusive(&pdev->dev,
|
||||
"switch");
|
||||
if (PTR_ERR(priv->rcdev) == -EPROBE_DEFER)
|
||||
if (IS_ERR(priv->rcdev))
|
||||
return PTR_ERR(priv->rcdev);
|
||||
|
||||
/* Auto-detection using standard registers will not work, so
|
||||
|
@ -1426,7 +1426,7 @@ static int bcm_sf2_sw_remove(struct platform_device *pdev)
|
|||
bcm_sf2_mdio_unregister(priv);
|
||||
clk_disable_unprepare(priv->clk_mdiv);
|
||||
clk_disable_unprepare(priv->clk);
|
||||
if (priv->type == BCM7278_DEVICE_ID && !IS_ERR(priv->rcdev))
|
||||
if (priv->type == BCM7278_DEVICE_ID)
|
||||
reset_control_assert(priv->rcdev);
|
||||
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue