]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
IB/usnic: clean up some error handling code
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 4 Jun 2015 09:02:18 +0000 (12:02 +0300)
committerDoug Ledford <dledford@redhat.com>
Thu, 11 Jun 2015 05:11:27 +0000 (01:11 -0400)
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>
drivers/infiniband/hw/usnic/usnic_uiom.c

index 417de1f329606e990fbcfa03580e3c3edcb51993..cb2337f0532b5dcbe0d328eb74a196d976b7b6dc 100644 (file)
@@ -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);