@@ -2653,8 +2653,6 @@ fec_probe(struct platform_device *pdev)
"Failed to enable phy regulator: %d\n", ret);
goto failed_regulator;
}
- } else {
- fep->reg_phy = NULL;
}
fec_reset_phy(pdev);
@@ -2704,7 +2702,7 @@ failed_register:
failed_mii_init:
failed_irq:
failed_init:
- if (fep->reg_phy)
+ if (!IS_ERR(fep->reg_phy))
regulator_disable(fep->reg_phy);
failed_regulator:
fec_enet_clk_enable(ndev, false);
@@ -2727,7 +2725,7 @@ fec_drv_remove(struct platform_device *pdev)
cancel_work_sync(&fep->tx_timeout_work);
unregister_netdev(ndev);
fec_enet_mii_remove(fep);
- if (fep->reg_phy)
+ if (!IS_ERR(fep->reg_phy))
regulator_disable(fep->reg_phy);
if (fep->ptp_clock)
ptp_clock_unregister(fep->ptp_clock);
@@ -2757,7 +2755,7 @@ static int __maybe_unused fec_suspend(struct device *dev)
fec_enet_clk_enable(ndev, false);
pinctrl_pm_select_sleep_state(&fep->pdev->dev);
- if (fep->reg_phy)
+ if (!IS_ERR(fep->reg_phy))
regulator_disable(fep->reg_phy);
return 0;
@@ -2769,7 +2767,7 @@ static int __maybe_unused fec_resume(struct device *dev)
struct fec_enet_private *fep = netdev_priv(ndev);
int ret;
- if (fep->reg_phy) {
+ if (!IS_ERR(fep->reg_phy)) {
ret = regulator_enable(fep->reg_phy);
if (ret)
return ret;
@@ -2794,7 +2792,7 @@ static int __maybe_unused fec_resume(struct device *dev)
return 0;
failed_clk:
- if (fep->reg_phy)
+ if (!IS_ERR(fep->reg_phy))
regulator_disable(fep->reg_phy);
return ret;
}