iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IB/usnic: simplify IS_ERR_OR_NULL to IS_ERR

Browse Source 
The function usnic_ib_qp_grp_get_chunk only returns an ERR_PTR value or a
valid pointer, never NULL.  The same is true of get_qp_res_chunk, which
just returns the result of calling usnic_ib_qp_grp_get_chunk.  Simplify
IS_ERR_OR_NULL to IS_ERR in both cases.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression t,e;
@@

t = \(usnic_ib_qp_grp_get_chunk(...)\|get_qp_res_chunk(...)\)
... when != t=e
- IS_ERR_OR_NULL(t)
+ IS_ERR(t)

@@
expression t,e,e1;
@@

t = \(usnic_ib_qp_grp_get_chunk(...)\|get_qp_res_chunk(...)\)
... when != t=e
?- t ? PTR_ERR(t) : e1
+ PTR_ERR(t)
... when any
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Julia Lawall
2016-11-11 20:04:26 +01:00
committed by Doug Ledford
parent 9315bc9a13
commit 5f4c7e4eb5
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
View File

@ -117,10 +117,10 @@ static int enable_qp_grp(struct usnic_ib_qp_grp *qp_grp)
vnic_idx = usnic_vnic_get_index(qp_grp->vf->vnic); vnic_idx = usnic_vnic_get_index(qp_grp->vf->vnic);
res_chunk = get_qp_res_chunk(qp_grp); res_chunk = get_qp_res_chunk(qp_grp);
if (IS_ERR_OR_NULL(res_chunk)) { if (IS_ERR(res_chunk)) {
usnic_err("Unable to get qp res with err %ld\n", usnic_err("Unable to get qp res with err %ld\n",
PTR_ERR(res_chunk)); PTR_ERR(res_chunk));
return res_chunk ? PTR_ERR(res_chunk) : -ENOMEM; return PTR_ERR(res_chunk);
} }
for (i = 0; i < res_chunk->cnt; i++) { for (i = 0; i < res_chunk->cnt; i++) {
@ -158,10 +158,10 @@ static int disable_qp_grp(struct usnic_ib_qp_grp *qp_grp)
vnic_idx = usnic_vnic_get_index(qp_grp->vf->vnic); vnic_idx = usnic_vnic_get_index(qp_grp->vf->vnic);
res_chunk = get_qp_res_chunk(qp_grp); res_chunk = get_qp_res_chunk(qp_grp);
if (IS_ERR_OR_NULL(res_chunk)) { if (IS_ERR(res_chunk)) {
usnic_err("Unable to get qp res with err %ld\n", usnic_err("Unable to get qp res with err %ld\n",
PTR_ERR(res_chunk)); PTR_ERR(res_chunk));
return res_chunk ? PTR_ERR(res_chunk) : -ENOMEM; return PTR_ERR(res_chunk);
} }
for (i = 0; i < res_chunk->cnt; i++) { for (i = 0; i < res_chunk->cnt; i++) {
@ -186,11 +186,11 @@ static int init_filter_action(struct usnic_ib_qp_grp *qp_grp,
struct usnic_vnic_res_chunk *res_chunk; struct usnic_vnic_res_chunk *res_chunk;
res_chunk = usnic_ib_qp_grp_get_chunk(qp_grp, USNIC_VNIC_RES_TYPE_RQ); res_chunk = usnic_ib_qp_grp_get_chunk(qp_grp, USNIC_VNIC_RES_TYPE_RQ);
if (IS_ERR_OR_NULL(res_chunk)) { if (IS_ERR(res_chunk)) {
usnic_err("Unable to get %s with err %ld\n", usnic_err("Unable to get %s with err %ld\n",
usnic_vnic_res_type_to_str(USNIC_VNIC_RES_TYPE_RQ), usnic_vnic_res_type_to_str(USNIC_VNIC_RES_TYPE_RQ),
PTR_ERR(res_chunk)); PTR_ERR(res_chunk));
return res_chunk ? PTR_ERR(res_chunk) : -ENOMEM; return PTR_ERR(res_chunk);
} }
uaction->vnic_idx = usnic_vnic_get_index(qp_grp->vf->vnic); uaction->vnic_idx = usnic_vnic_get_index(qp_grp->vf->vnic);

12
drivers/infiniband/hw/usnic/usnic_ib_verbs.c
View File

@ -87,12 +87,12 @@ static int usnic_ib_fill_create_qp_resp(struct usnic_ib_qp_grp *qp_grp,
resp.bar_len = bar->len; resp.bar_len = bar->len;
chunk = usnic_ib_qp_grp_get_chunk(qp_grp, USNIC_VNIC_RES_TYPE_RQ); chunk = usnic_ib_qp_grp_get_chunk(qp_grp, USNIC_VNIC_RES_TYPE_RQ);
if (IS_ERR_OR_NULL(chunk)) { if (IS_ERR(chunk)) {
usnic_err("Failed to get chunk %s for qp_grp %d with err %ld\n", usnic_err("Failed to get chunk %s for qp_grp %d with err %ld\n",
usnic_vnic_res_type_to_str(USNIC_VNIC_RES_TYPE_RQ), usnic_vnic_res_type_to_str(USNIC_VNIC_RES_TYPE_RQ),
qp_grp->grp_id, qp_grp->grp_id,
PTR_ERR(chunk)); PTR_ERR(chunk));
return chunk ? PTR_ERR(chunk) : -ENOMEM; return PTR_ERR(chunk);
} }
WARN_ON(chunk->type != USNIC_VNIC_RES_TYPE_RQ); WARN_ON(chunk->type != USNIC_VNIC_RES_TYPE_RQ);
@ -101,12 +101,12 @@ static int usnic_ib_fill_create_qp_resp(struct usnic_ib_qp_grp *qp_grp,
resp.rq_idx[i] = chunk->res[i]->vnic_idx; resp.rq_idx[i] = chunk->res[i]->vnic_idx;
chunk = usnic_ib_qp_grp_get_chunk(qp_grp, USNIC_VNIC_RES_TYPE_WQ); chunk = usnic_ib_qp_grp_get_chunk(qp_grp, USNIC_VNIC_RES_TYPE_WQ);
if (IS_ERR_OR_NULL(chunk)) { if (IS_ERR(chunk)) {
usnic_err("Failed to get chunk %s for qp_grp %d with err %ld\n", usnic_err("Failed to get chunk %s for qp_grp %d with err %ld\n",
usnic_vnic_res_type_to_str(USNIC_VNIC_RES_TYPE_WQ), usnic_vnic_res_type_to_str(USNIC_VNIC_RES_TYPE_WQ),
qp_grp->grp_id, qp_grp->grp_id,
PTR_ERR(chunk)); PTR_ERR(chunk));
return chunk ? PTR_ERR(chunk) : -ENOMEM; return PTR_ERR(chunk);
} }
WARN_ON(chunk->type != USNIC_VNIC_RES_TYPE_WQ); WARN_ON(chunk->type != USNIC_VNIC_RES_TYPE_WQ);
@ -115,12 +115,12 @@ static int usnic_ib_fill_create_qp_resp(struct usnic_ib_qp_grp *qp_grp,
resp.wq_idx[i] = chunk->res[i]->vnic_idx; resp.wq_idx[i] = chunk->res[i]->vnic_idx;
chunk = usnic_ib_qp_grp_get_chunk(qp_grp, USNIC_VNIC_RES_TYPE_CQ); chunk = usnic_ib_qp_grp_get_chunk(qp_grp, USNIC_VNIC_RES_TYPE_CQ);
if (IS_ERR_OR_NULL(chunk)) { if (IS_ERR(chunk)) {
usnic_err("Failed to get chunk %s for qp_grp %d with err %ld\n", usnic_err("Failed to get chunk %s for qp_grp %d with err %ld\n",
usnic_vnic_res_type_to_str(USNIC_VNIC_RES_TYPE_CQ), usnic_vnic_res_type_to_str(USNIC_VNIC_RES_TYPE_CQ),
qp_grp->grp_id, qp_grp->grp_id,
PTR_ERR(chunk)); PTR_ERR(chunk));
return chunk ? PTR_ERR(chunk) : -ENOMEM; return PTR_ERR(chunk);
} }
WARN_ON(chunk->type != USNIC_VNIC_RES_TYPE_CQ); WARN_ON(chunk->type != USNIC_VNIC_RES_TYPE_CQ);