openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Markus Elfring 2018-01-27 20:56:56 +01:00 committed by Jason Gunthorpe
parent f390b71b65
commit e5b8984386
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/infiniband/hw/bnxt_re/qplib_res.c
View File

@ -705,10 +705,8 @@ static int bnxt_qplib_alloc_dpi_tbl(struct bnxt_qplib_res *res,
dpit->max = dbr_len / PAGE_SIZE; dpit->max = dbr_len / PAGE_SIZE;
dpit->app_tbl = kcalloc(dpit->max, sizeof(void *), GFP_KERNEL); dpit->app_tbl = kcalloc(dpit->max, sizeof(void *), GFP_KERNEL);
if (!dpit->app_tbl) { if (!dpit->app_tbl)
pci_iounmap(res->pdev, dpit->dbr_bar_reg_iomem); goto unmap_io;
return -ENOMEM;
}
bytes = dpit->max >> 3; bytes = dpit->max >> 3;
if (!bytes) if (!bytes)
@ -716,15 +714,18 @@ static int bnxt_qplib_alloc_dpi_tbl(struct bnxt_qplib_res *res,
dpit->tbl = kmalloc(bytes, GFP_KERNEL); dpit->tbl = kmalloc(bytes, GFP_KERNEL);
if (!dpit->tbl) { if (!dpit->tbl) {
pci_iounmap(res->pdev, dpit->dbr_bar_reg_iomem);
kfree(dpit->app_tbl); kfree(dpit->app_tbl);
dpit->app_tbl = NULL; dpit->app_tbl = NULL;
return -ENOMEM; goto unmap_io;
} }
memset((u8 *)dpit->tbl, 0xFF, bytes); memset((u8 *)dpit->tbl, 0xFF, bytes);
return 0; return 0;
unmap_io:
pci_iounmap(res->pdev, dpit->dbr_bar_reg_iomem);
return -ENOMEM;
} }
/* PKEYs */ /* PKEYs */