| Message ID | 1500966026-88504-1-git-send-email-xiangxia.m.yue@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
aFrom: Tonghao Zhang <xiangxia.m.yue@gmail.com> Date: Tue, 25 Jul 2017 00:00:26 -0700 > we can use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR > 1. drivers/net/appletalk/ipddp.c > 2. drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c > > Generated by: scripts/coccinelle/api/ptr_ret.cocci > > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> Applied to net-next, thanks.
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index a306de4..9375cef 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c @@ -311,9 +311,7 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int __init ipddp_init_module(void) { dev_ipddp = ipddp_init(); - if (IS_ERR(dev_ipddp)) - return PTR_ERR(dev_ipddp); - return 0; + return PTR_ERR_OR_ZERO(dev_ipddp); } static void __exit ipddp_cleanup_module(void) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c index 1447a83..2d3e5e2 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c @@ -78,10 +78,7 @@ int brcmf_debug_attach(struct brcmf_pub *drvr) return -ENODEV; drvr->dbgfs_dir = debugfs_create_dir(dev_name(dev), root_folder); - if (IS_ERR(drvr->dbgfs_dir)) - return PTR_ERR(drvr->dbgfs_dir); - - return 0; + return PTR_ERR_OR_ZERO(drvr->dbgfs_dir); } void brcmf_debug_detach(struct brcmf_pub *drvr)
we can use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR 1. drivers/net/appletalk/ipddp.c 2. drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c Generated by: scripts/coccinelle/api/ptr_ret.cocci Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> --- drivers/net/appletalk/ipddp.c | 4 +--- drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-)