| Message ID | 20211118113924.GH1147@kili (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | RDMA: clean up usnic_ib_alloc_pd() | expand |
On Thu, Nov 18, 2021 at 02:39:24PM +0300, Dan Carpenter wrote: > Remove the unnecessary "umem_pd" variable. And usnic_uiom_alloc_pd() > never returns NULL so remove the NULL check. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
On Thu, Nov 18, 2021 at 02:39:24PM +0300, Dan Carpenter wrote: > Remove the unnecessary "umem_pd" variable. And usnic_uiom_alloc_pd() > never returns NULL so remove the NULL check. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > Reviewed-by: Leon Romanovsky <leonro@nvidia.com> > --- > drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) Applied to for-next, thanks Jason
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c index 756a83bcff58..5a0e26cd648e 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c @@ -442,12 +442,10 @@ int usnic_ib_query_gid(struct ib_device *ibdev, u32 port, int index, int usnic_ib_alloc_pd(struct ib_pd *ibpd, struct ib_udata *udata) { struct usnic_ib_pd *pd = to_upd(ibpd); - void *umem_pd; - umem_pd = pd->umem_pd = usnic_uiom_alloc_pd(); - if (IS_ERR_OR_NULL(umem_pd)) { - return umem_pd ? PTR_ERR(umem_pd) : -ENOMEM; - } + pd->umem_pd = usnic_uiom_alloc_pd(); + if (IS_ERR(pd->umem_pd)) + return PTR_ERR(pd->umem_pd); return 0; }
Remove the unnecessary "umem_pd" variable. And usnic_uiom_alloc_pd() never returns NULL so remove the NULL check. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)