diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-06-04 12:02:18 +0300 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2015-06-11 01:11:27 -0400 |
commit | fc3aa45b63101a11859e171aed9622d35cb02d16 (patch) | |
tree | 800d096e0a45c2f043ccc56d1bdf4e0547830d7c /drivers/infiniband/hw/usnic | |
parent | ed0de4a8c9dd6922a55226780b3d55dd751ad878 (diff) | |
download | linux-stable-fc3aa45b63101a11859e171aed9622d35cb02d16.tar.gz linux-stable-fc3aa45b63101a11859e171aed9622d35cb02d16.tar.bz2 linux-stable-fc3aa45b63101a11859e171aed9622d35cb02d16.zip |
IB/usnic: clean up some error handling code
This code causes a static checker warning:
drivers/infiniband/hw/usnic/usnic_uiom.c:476 usnic_uiom_alloc_pd()
warn: passing zero to 'PTR_ERR'
This code isn't buggy, but iommu_domain_alloc() doesn't return an error
pointer so we can simplify the error handling and silence the static
checker warning.
The static checker warning is to catch place which do:
if (!ptr)
return ERR_PTR(ptr);
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Dave Goodell <dgoodell@cisco.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw/usnic')
-rw-r--r-- | drivers/infiniband/hw/usnic/usnic_uiom.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index 417de1f32960..cb2337f0532b 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c @@ -472,11 +472,10 @@ struct usnic_uiom_pd *usnic_uiom_alloc_pd(void) return ERR_PTR(-ENOMEM); pd->domain = domain = iommu_domain_alloc(&pci_bus_type); - if (IS_ERR_OR_NULL(domain)) { - usnic_err("Failed to allocate IOMMU domain with err %ld\n", - PTR_ERR(pd->domain)); + if (!domain) { + usnic_err("Failed to allocate IOMMU domain"); kfree(pd); - return ERR_PTR(domain ? PTR_ERR(domain) : -ENOMEM); + return ERR_PTR(-ENOMEM); } iommu_set_fault_handler(pd->domain, usnic_uiom_dma_fault, NULL); |