From faea30ed717d78e890f3fc0d96ceb6aba2baa4c4 Mon Sep 17 00:00:00 2001 From: kernel test robot Date: Fri, 10 Jul 2020 00:06:18 +0800 Subject: net: phy: mscc: fix ptr_ret.cocci warnings drivers/net/phy/mscc/mscc_ptp.c:1496:1-3: WARNING: PTR_ERR_OR_ZERO can be used Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR Generated by: scripts/coccinelle/api/ptr_ret.cocci Fixes: 7d272e63e097 ("net: phy: mscc: timestamping and PHC support") CC: Antoine Tenart Signed-off-by: kernel test robot Signed-off-by: David S. Miller --- drivers/net/phy/mscc/mscc_ptp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/net/phy/mscc') diff --git a/drivers/net/phy/mscc/mscc_ptp.c b/drivers/net/phy/mscc/mscc_ptp.c index ef3441747348..b97ee79f3cdf 100644 --- a/drivers/net/phy/mscc/mscc_ptp.c +++ b/drivers/net/phy/mscc/mscc_ptp.c @@ -1494,10 +1494,7 @@ static int __vsc8584_init_ptp(struct phy_device *phydev) vsc8531->ptp->ptp_clock = ptp_clock_register(&vsc8531->ptp->caps, &phydev->mdio.dev); - if (IS_ERR(vsc8531->ptp->ptp_clock)) - return PTR_ERR(vsc8531->ptp->ptp_clock); - - return 0; + return PTR_ERR_OR_ZERO(vsc8531->ptp->ptp_clock); } void vsc8584_config_ts_intr(struct phy_device *phydev) -- cgit v1.2.3