| Message ID | 20230817071941.346590-3-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | net: Use helper function IS_ERR_OR_NULL() | expand |
On Thu, Aug 17, 2023 at 03:19:41PM +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/stmicro/stmmac/stmmac_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 733b5e900817..fe2452a70d23 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -1165,7 +1165,7 @@ static int stmmac_init_phy(struct net_device *dev) > /* Some DT bindings do not set-up the PHY handle. Let's try to > * manually parse it > */ > - if (!phy_fwnode || IS_ERR(phy_fwnode)) { > + if (IS_ERR_OR_NULL(phy_fwnode)) { > int addr = priv->plat->phy_addr; > struct phy_device *phydev; Up to the stmmac maintainers, but I have never been a fan of "IS_ERR_OR_NULL" because it leads to programming errors such as those I pointed out in your changes to I2C drivers. I would much rather see IS_ERR_OR_NULL removed from the kernel entirely. That is my personal opinion. In this case, it doesn't matter because we're not returning the phy_fwnode error, we're detecting it and taking some alternative action - but given my inherent dislike of IS_ERR_OR_NULL, I prefer the original.
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 733b5e900817..fe2452a70d23 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -1165,7 +1165,7 @@ static int stmmac_init_phy(struct net_device *dev) /* Some DT bindings do not set-up the PHY handle. Let's try to * manually parse it */ - if (!phy_fwnode || IS_ERR(phy_fwnode)) { + if (IS_ERR_OR_NULL(phy_fwnode)) { int addr = priv->plat->phy_addr; struct phy_device *phydev;
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/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)