Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5b89843 authored by Markus Elfring's avatar Markus Elfring Committed by Jason Gunthorpe
Browse files

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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Acked-by: default avatarDevesh Sharma <devesh.sharma@broadcom.com>
Acked-by: default avatarJonathan Toppins <jtoppins@redhat.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent f390b71b

drivers/infiniband/hw/bnxt_re/qplib_res.c

+7 −6
Original line number Diff line number Diff line
@@ -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 */