RDMA/bnxt_re: Use common error handling code in bnxt_qplib_alloc_dpi_tbl()

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Devesh Sharma <devesh.sharma@broadcom.com>
Acked-by: Jonathan Toppins <jtoppins@redhat.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/hw/bnxt_re/qplib_res.c b/drivers/infiniband/hw/bnxt_re/qplib_res.c
index 9dacfd24869b7d38a4f2acddf7eed7504716eed3..539a5d44e6dbe37012cbc5cc450078aee17a33af 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/qplib_res.c
+++ b/drivers/infiniband/hw/bnxt_re/qplib_res.c
@@ -705,10 +705,8 @@ static int bnxt_qplib_alloc_dpi_tbl(struct bnxt_qplib_res     *res,
        dpit->max = dbr_len / PAGE_SIZE;
 
        dpit->app_tbl = kcalloc(dpit->max, sizeof(void *), GFP_KERNEL);
-       if (!dpit->app_tbl) {
-               pci_iounmap(res->pdev, dpit->dbr_bar_reg_iomem);
-               return -ENOMEM;
-       }
+       if (!dpit->app_tbl)
+               goto unmap_io;
 
        bytes = dpit->max >> 3;
        if (!bytes)
@@ -716,15 +714,18 @@ static int bnxt_qplib_alloc_dpi_tbl(struct bnxt_qplib_res     *res,
 
        dpit->tbl = kmalloc(bytes, GFP_KERNEL);
        if (!dpit->tbl) {
-               pci_iounmap(res->pdev, dpit->dbr_bar_reg_iomem);
                kfree(dpit->app_tbl);
                dpit->app_tbl = NULL;
-               return -ENOMEM;
+               goto unmap_io;
        }
 
        memset((u8 *)dpit->tbl, 0xFF, bytes);
 
        return 0;
+
+unmap_io:
+       pci_iounmap(res->pdev, dpit->dbr_bar_reg_iomem);
+       return -ENOMEM;
 }
 
 /* PKEYs */