Removes repeated calls to kfree() and return; by introducing a label
and goto label.
Signed off by : Om Narasimhan <[email protected]>
drivers/block/cpqarray.c | 62 +++++++++++++++-------------------------------
1 files changed, 20 insertions(+), 42 deletions(-)
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 78082ed..e167cec 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -1642,58 +1642,47 @@ static void start_fwbk(int ctlr)
It is used only at init time.
*****************************************************************/
static void getgeometry(int ctlr)
-{
- id_log_drv_t *id_ldrive;
- id_ctlr_t *id_ctlr_buf;
- sense_log_drv_stat_t *id_lstatus_buf;
- config_t *sense_config_buf;
+{
+ id_log_drv_t *id_ldrive = NULL;
+ id_ctlr_t *id_ctlr_buf = NULL;
+ sense_log_drv_stat_t *id_lstatus_buf = NULL;
+ config_t *sense_config_buf = NULL;
unsigned int log_unit, log_index;
int ret_code, size;
- drv_info_t *drv;
+ drv_info_t *drv = NULL;
ctlr_info_t *info_p = hba[ctlr];
int i;
info_p->log_drv_map = 0;
- id_ldrive = (id_log_drv_t *)kmalloc(sizeof(id_log_drv_t), GFP_KERNEL);
+ id_ldrive = (id_log_drv_t *)kzalloc(sizeof(id_log_drv_t), GFP_KERNEL);
if(id_ldrive == NULL)
{
printk( KERN_ERR "cpqarray: out of memory.\n");
- return;
+ goto end;
}
- id_ctlr_buf = (id_ctlr_t *)kmalloc(sizeof(id_ctlr_t), GFP_KERNEL);
+ id_ctlr_buf = (id_ctlr_t *)kzalloc(sizeof(id_ctlr_t), GFP_KERNEL);
if(id_ctlr_buf == NULL)
{
- kfree(id_ldrive);
printk( KERN_ERR "cpqarray: out of memory.\n");
- return;
+ goto end;
}
- id_lstatus_buf = (sense_log_drv_stat_t
*)kmalloc(sizeof(sense_log_drv_stat_t), GFP_KERNEL);
+ id_lstatus_buf = (sense_log_drv_stat_t
*)kzalloc(sizeof(sense_log_drv_stat_t), GFP_KERNEL);
if(id_lstatus_buf == NULL)
{
- kfree(id_ctlr_buf);
- kfree(id_ldrive);
printk( KERN_ERR "cpqarray: out of memory.\n");
- return;
+ goto end;
}
- sense_config_buf = (config_t *)kmalloc(sizeof(config_t), GFP_KERNEL);
+ sense_config_buf = (config_t *)kzalloc(sizeof(config_t), GFP_KERNEL);
if(sense_config_buf == NULL)
{
- kfree(id_lstatus_buf);
- kfree(id_ctlr_buf);
- kfree(id_ldrive);
printk( KERN_ERR "cpqarray: out of memory.\n");
- return;
+ goto end;
}
- memset(id_ldrive, 0, sizeof(id_log_drv_t));
- memset(id_ctlr_buf, 0, sizeof(id_ctlr_t));
- memset(id_lstatus_buf, 0, sizeof(sense_log_drv_stat_t));
- memset(sense_config_buf, 0, sizeof(config_t));
-
info_p->phys_drives = 0;
info_p->log_drv_map = 0;
info_p->drv_assign_map = 0;
@@ -1709,11 +1698,7 @@ static void getgeometry(int ctlr)
*/
/* Free all the buffers and return */
printk(KERN_ERR "cpqarray: error sending ID controller\n");
- kfree(sense_config_buf);
- kfree(id_lstatus_buf);
- kfree(id_ctlr_buf);
- kfree(id_ldrive);
- return;
+ goto end;
}
info_p->log_drives = id_ctlr_buf->nr_drvs;
@@ -1760,11 +1745,7 @@ static void getgeometry(int ctlr)
"Access to this controller has been disabled\n",
ctlr, log_unit);
/* Free all the buffers and return */
- kfree(sense_config_buf);
- kfree(id_lstatus_buf);
- kfree(id_ctlr_buf);
- kfree(id_ldrive);
- return;
+ goto end;
}
/*
Make sure the logical drive is configured
@@ -1795,11 +1776,7 @@ static void getgeometry(int ctlr)
info_p->log_drv_map = 0;
/* Free all the buffers and return */
printk(KERN_ERR "cpqarray: error sending sense config\n");
- kfree(sense_config_buf);
- kfree(id_lstatus_buf);
- kfree(id_ctlr_buf);
- kfree(id_ldrive);
- return;
+ goto end;
}
@@ -1815,9 +1792,10 @@ static void getgeometry(int ctlr)
log_index = log_index + 1;
} /* end of if logical drive configured */
} /* end of for log_unit */
+end:
kfree(sense_config_buf);
- kfree(id_ldrive);
- kfree(id_lstatus_buf);
+ kfree(id_ldrive);
+ kfree(id_lstatus_buf);
kfree(id_ctlr_buf);
return;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
