2018-11-27 23:23:29

by Fengguang Wu

[permalink] [raw]
Subject: [PATCH] RDMA/uverbs: fix ptr_ret.cocci warnings

From: kbuild test robot <[email protected]>

drivers/infiniband/core/uverbs_cmd.c:1095: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: 7106a9769715 ("RDMA/uverbs: Make write() handlers return 0 on success")
Signed-off-by: kbuild test robot <[email protected]>
---

tree: git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma for-next
head: 07f05f40d956d40f32852a7b3ff109a72d254cf9
commit: 7106a9769715bb4c0448927a29aa3b505855871c [31/37] RDMA/uverbs: Make write() handlers return 0 on success

uverbs_cmd.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1092,10 +1092,7 @@ static int ib_uverbs_create_cq(struct uv
sizeof(cmd.comp_channel), ib_uverbs_create_cq_cb,
NULL);

- if (IS_ERR(obj))
- return PTR_ERR(obj);
-
- return 0;
+ return PTR_ERR_OR_ZERO(obj);
}

static int ib_uverbs_ex_create_cq_cb(struct uverbs_attr_bundle *attrs,


2018-11-29 23:38:24

by Jason Gunthorpe

[permalink] [raw]
Subject: Re: [PATCH] RDMA/uverbs: fix ptr_ret.cocci warnings

On Wed, Nov 28, 2018 at 07:21:30AM +0800, kbuild test robot wrote:
> From: kbuild test robot <[email protected]>
>
> drivers/infiniband/core/uverbs_cmd.c:1095: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: 7106a9769715 ("RDMA/uverbs: Make write() handlers return 0 on success")
> Signed-off-by: kbuild test robot <[email protected]>
> ---

applied to for-next, thanks

Jason

2018-12-03 17:25:23

by Doug Ledford

[permalink] [raw]
Subject: Re: [PATCH] RDMA/uverbs: fix ptr_ret.cocci warnings

On Thu, 2018-11-29 at 16:37 -0700, Jason Gunthorpe wrote:
> On Wed, Nov 28, 2018 at 07:21:30AM +0800, kbuild test robot wrote:
> > From: kbuild test robot <[email protected]>
> >
> > drivers/infiniband/core/uverbs_cmd.c:1095: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: 7106a9769715 ("RDMA/uverbs: Make write() handlers return 0 on success")
> > Signed-off-by: kbuild test robot <[email protected]>
> > ---
>
> applied to for-next, thanks
>
> Jason

This caused a conflict with your make write() handlers use a consistent
flow series, which I fixed up during git am run. Just FYI in case you
want to check out the conflict spot as a double check (but it was a
simple fixup).

--
Doug Ledford <[email protected]>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD


Attachments:
signature.asc (849.00 B)
This is a digitally signed message part

2018-12-03 20:48:02

by Jason Gunthorpe

[permalink] [raw]
Subject: Re: [PATCH] RDMA/uverbs: fix ptr_ret.cocci warnings

On Mon, Dec 03, 2018 at 12:23:35PM -0500, Doug Ledford wrote:
> On Thu, 2018-11-29 at 16:37 -0700, Jason Gunthorpe wrote:
> > On Wed, Nov 28, 2018 at 07:21:30AM +0800, kbuild test robot wrote:
> > > From: kbuild test robot <[email protected]>
> > >
> > > drivers/infiniband/core/uverbs_cmd.c:1095: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: 7106a9769715 ("RDMA/uverbs: Make write() handlers return 0 on success")
> > > Signed-off-by: kbuild test robot <[email protected]>
> >
> > applied to for-next, thanks
> >
> > Jason
>
> This caused a conflict with your make write() handlers use a consistent
> flow series, which I fixed up during git am run. Just FYI in case you
> want to check out the conflict spot as a double check (but it was a
> simple fixup).

Looks OK to me thanks

Jason