Re: [PATCH -next] net: broadcom: Use helper function IS_ERR_OR_NULL()

[Leon Romanovsky <leon@kernel.org>]

On Wed, Aug 16, 2023 at 05:53:56PM +0800, Ruan Jinjie wrote:
> Use IS_ERR_OR_NULL() instead of open-coding it
> to simplify the code.
> 
> Signed-off-by: Ruan Jinjie <ruanjinjie@huawei.com>
> ---
>  drivers/net/ethernet/broadcom/bgmac.c        | 2 +-
>  drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
> index 10c7c232cc4e..4cd7c6abb548 100644
> --- a/drivers/net/ethernet/broadcom/bgmac.c
> +++ b/drivers/net/ethernet/broadcom/bgmac.c
> @@ -1448,7 +1448,7 @@ int bgmac_phy_connect_direct(struct bgmac *bgmac)
>  	int err;
>  
>  	phy_dev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);

When can fixed_phy_register() return NULL?
It looks like it returns or valid phy_dev or ERR_PTR().

Thanks


> -	if (!phy_dev || IS_ERR(phy_dev)) {
> +	if (IS_ERR_OR_NULL(phy_dev)) {
>  		dev_err(bgmac->dev, "Failed to register fixed PHY device\n");
>  		return -ENODEV;
>  	}
> diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c
> index 0092e46c46f8..aa9a436fb3ce 100644
> --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
> +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
> @@ -617,7 +617,7 @@ static int bcmgenet_mii_pd_init(struct bcmgenet_priv *priv)
>  		};
>  
>  		phydev = fixed_phy_register(PHY_POLL, &fphy_status, NULL);
> -		if (!phydev || IS_ERR(phydev)) {
> +		if (IS_ERR_OR_NULL(phydev)) {
>  			dev_err(kdev, "failed to register fixed PHY device\n");
>  			return -ENODEV;
>  		}
> -- 
> 2.34.1
> 
>