| Message ID | 1611542381-91178-1-git-send-email-abaci-bugfix@linux.alibaba.com |
|---|---|
| State | New |
| Headers | show |
| Series | bridge: Use PTR_ERR_OR_ZERO instead if(IS_ERR(...)) + PTR_ERR | expand |
On 25/01/2021 04:39, Jiapeng Zhong wrote: > coccicheck suggested using PTR_ERR_OR_ZERO() and looking at the code. > > Fix the following coccicheck warnings: > > ./net/bridge/br_multicast.c:1295:7-13: WARNING: PTR_ERR_OR_ZERO can be > used. > > Reported-by: Abaci <abaci@linux.alibaba.com> > Signed-off-by: Jiapeng Zhong <abaci-bugfix@linux.alibaba.com> > --- > net/bridge/br_multicast.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c > index 257ac4e..2229d10 100644 > --- a/net/bridge/br_multicast.c > +++ b/net/bridge/br_multicast.c > @@ -1292,7 +1292,7 @@ static int br_multicast_add_group(struct net_bridge *br, > pg = __br_multicast_add_group(br, port, group, src, filter_mode, > igmpv2_mldv1, false); > /* NULL is considered valid for host joined groups */ > - err = IS_ERR(pg) ? PTR_ERR(pg) : 0; > + err = PTR_ERR_OR_ZERO(pg); > spin_unlock(&br->multicast_lock); > > return err; > This should be targeted at net-next. Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
On Mon, 25 Jan 2021 10:23:00 +0200 Nikolay Aleksandrov wrote: > On 25/01/2021 04:39, Jiapeng Zhong wrote: > > coccicheck suggested using PTR_ERR_OR_ZERO() and looking at the code. > > > > Fix the following coccicheck warnings: > > > > ./net/bridge/br_multicast.c:1295:7-13: WARNING: PTR_ERR_OR_ZERO can be > > used. > > > > Reported-by: Abaci <abaci@linux.alibaba.com> > > Signed-off-by: Jiapeng Zhong <abaci-bugfix@linux.alibaba.com> > > --- > > net/bridge/br_multicast.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c > > index 257ac4e..2229d10 100644 > > --- a/net/bridge/br_multicast.c > > +++ b/net/bridge/br_multicast.c > > @@ -1292,7 +1292,7 @@ static int br_multicast_add_group(struct net_bridge *br, > > pg = __br_multicast_add_group(br, port, group, src, filter_mode, > > igmpv2_mldv1, false); > > /* NULL is considered valid for host joined groups */ > > - err = IS_ERR(pg) ? PTR_ERR(pg) : 0; > > + err = PTR_ERR_OR_ZERO(pg); > > spin_unlock(&br->multicast_lock); > > > > return err; > > > > This should be targeted at net-next. > Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com> Applied, thanks!
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Mon, 25 Jan 2021 10:39:41 +0800 you wrote: > coccicheck suggested using PTR_ERR_OR_ZERO() and looking at the code. > > Fix the following coccicheck warnings: > > ./net/bridge/br_multicast.c:1295:7-13: WARNING: PTR_ERR_OR_ZERO can be > used. > > [...] Here is the summary with links: - bridge: Use PTR_ERR_OR_ZERO instead if(IS_ERR(...)) + PTR_ERR https://git.kernel.org/netdev/net-next/c/8d21c882aba8 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 257ac4e..2229d10 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1292,7 +1292,7 @@ static int br_multicast_add_group(struct net_bridge *br, pg = __br_multicast_add_group(br, port, group, src, filter_mode, igmpv2_mldv1, false); /* NULL is considered valid for host joined groups */ - err = IS_ERR(pg) ? PTR_ERR(pg) : 0; + err = PTR_ERR_OR_ZERO(pg); spin_unlock(&br->multicast_lock); return err;
coccicheck suggested using PTR_ERR_OR_ZERO() and looking at the code. Fix the following coccicheck warnings: ./net/bridge/br_multicast.c:1295:7-13: WARNING: PTR_ERR_OR_ZERO can be used. Reported-by: Abaci <abaci@linux.alibaba.com> Signed-off-by: Jiapeng Zhong <abaci-bugfix@linux.alibaba.com> --- net/bridge/br_multicast.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)