IB/usnic: Remove superflous parentheses
Signed-off-by: Upinder Malhi <umalhi@cisco.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
index 3b7e8bd..f7be445 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
@@ -470,7 +470,7 @@
us_ibdev = usnic_ib_device_add(parent_pci);
if (IS_ERR_OR_NULL(us_ibdev)) {
- us_ibdev = (us_ibdev) ? us_ibdev : ERR_PTR(-EFAULT);
+ us_ibdev = us_ibdev ? us_ibdev : ERR_PTR(-EFAULT);
goto out;
}
@@ -526,7 +526,7 @@
vf->vnic = usnic_vnic_alloc(pdev);
if (IS_ERR_OR_NULL(vf->vnic)) {
- err = (vf->vnic ? PTR_ERR(vf->vnic) : -ENOMEM);
+ err = vf->vnic ? PTR_ERR(vf->vnic) : -ENOMEM;
usnic_err("Failed to alloc vnic for %s with err %d\n",
pci_name(pdev), err);
goto out_release_regions;
@@ -536,7 +536,7 @@
if (IS_ERR_OR_NULL(pf)) {
usnic_err("Failed to discover pf of vnic %s with err%ld\n",
pci_name(pdev), PTR_ERR(pf));
- err = (pf ? PTR_ERR(pf) : -EFAULT);
+ err = pf ? PTR_ERR(pf) : -EFAULT;
goto out_clean_vnic;
}
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
index d6667a1..3e17c7c 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
@@ -214,14 +214,14 @@
if (IS_ERR_OR_NULL(flow)) {
usnic_err("Unable to alloc flow failed with err %ld\n",
PTR_ERR(flow));
- err = (flow) ? PTR_ERR(flow) : -EFAULT;
+ err = flow ? PTR_ERR(flow) : -EFAULT;
goto out_unreserve_port;
}
/* Create Flow Handle */
qp_flow = kzalloc(sizeof(*qp_flow), GFP_ATOMIC);
if (IS_ERR_OR_NULL(qp_flow)) {
- err = (qp_flow) ? PTR_ERR(qp_flow) : -ENOMEM;
+ err = qp_flow ? PTR_ERR(qp_flow) : -ENOMEM;
goto out_dealloc_flow;
}
qp_flow->flow = flow;
@@ -289,14 +289,14 @@
if (IS_ERR_OR_NULL(flow)) {
usnic_err("Unable to alloc flow failed with err %ld\n",
PTR_ERR(flow));
- err = (flow) ? PTR_ERR(flow) : -EFAULT;
+ err = flow ? PTR_ERR(flow) : -EFAULT;
goto out_put_sock;
}
/* Create qp_flow */
qp_flow = kzalloc(sizeof(*qp_flow), GFP_ATOMIC);
if (IS_ERR_OR_NULL(qp_flow)) {
- err = (qp_flow) ? PTR_ERR(qp_flow) : -ENOMEM;
+ err = qp_flow ? PTR_ERR(qp_flow) : -ENOMEM;
goto out_dealloc_flow;
}
qp_flow->flow = flow;
@@ -415,7 +415,7 @@
qp_flow = create_and_add_flow(qp_grp,
trans_spec);
if (IS_ERR_OR_NULL(qp_flow)) {
- status = (qp_flow) ? PTR_ERR(qp_flow) : -EFAULT;
+ status = qp_flow ? PTR_ERR(qp_flow) : -EFAULT;
break;
}
} else {
@@ -430,7 +430,7 @@
qp_flow = create_and_add_flow(qp_grp,
trans_spec);
if (IS_ERR_OR_NULL(qp_flow)) {
- status = (qp_flow) ? PTR_ERR(qp_flow) : -EFAULT;
+ status = qp_flow ? PTR_ERR(qp_flow) : -EFAULT;
break;
}
} else {
@@ -543,8 +543,8 @@
res_chunk_list[i] = usnic_vnic_get_resources(vnic, res_type,
res_cnt, owner_obj);
if (IS_ERR_OR_NULL(res_chunk_list[i])) {
- err = (res_chunk_list[i] ?
- PTR_ERR(res_chunk_list[i]) : -ENOMEM);
+ err = res_chunk_list[i] ?
+ PTR_ERR(res_chunk_list[i]) : -ENOMEM;
usnic_err("Failed to get %s from %s with err %d\n",
usnic_vnic_res_type_to_str(res_type),
usnic_vnic_pci_name(vnic),
@@ -697,7 +697,7 @@
if (IS_ERR_OR_NULL(qp_flow)) {
usnic_err("Unable to create and add flow with err %ld\n",
PTR_ERR(qp_flow));
- err = (qp_flow) ? PTR_ERR(qp_flow) : -EFAULT;
+ err = qp_flow ? PTR_ERR(qp_flow) : -EFAULT;
goto out_qp_grp_vf_unbind;
}
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
index 937113f..d48d2c0 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
@@ -495,7 +495,7 @@
&trans_spec,
&res_spec);
if (IS_ERR_OR_NULL(qp_grp)) {
- err = (qp_grp ? PTR_ERR(qp_grp) : -ENOMEM);
+ err = qp_grp ? PTR_ERR(qp_grp) : -ENOMEM;
goto out_release_mutex;
}
@@ -605,7 +605,7 @@
mr->umem = usnic_uiom_reg_get(to_upd(pd)->umem_pd, start, length,
access_flags, 0);
if (IS_ERR_OR_NULL(mr->umem)) {
- err = (mr->umem) ? PTR_ERR(mr->umem) : -EFAULT;
+ err = mr->umem ? PTR_ERR(mr->umem) : -EFAULT;
goto err_free;
}