Commit 17fd682e authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

[PATCH] kfree cleanup: drivers/s390



This is the drivers/s390/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in drivers/s390/.
Signed-off-by: default avatarJesper Juhl <jesper.juhl@gmail.com>
Acked-by: default avatarCornelia Huck <cohuck@de.ibm.com>
Acked-by: default avatarStefan Bader <Stefan.Bader@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3c7208f2
......@@ -115,8 +115,7 @@ dasd_alloc_device(void)
void
dasd_free_device(struct dasd_device *device)
{
if (device->private)
kfree(device->private);
kfree(device->private);
free_page((unsigned long) device->erp_mem);
free_pages((unsigned long) device->ccw_mem, 1);
kfree(device);
......@@ -539,8 +538,7 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize,
if (datasize > 0) {
cqr->data = kmalloc(datasize, GFP_ATOMIC | GFP_DMA);
if (cqr->data == NULL) {
if (cqr->cpaddr != NULL)
kfree(cqr->cpaddr);
kfree(cqr->cpaddr);
kfree(cqr);
return ERR_PTR(-ENOMEM);
}
......@@ -615,10 +613,8 @@ dasd_kfree_request(struct dasd_ccw_req * cqr, struct dasd_device * device)
clear_normalized_cda(ccw);
} while (ccw++->flags & (CCW_FLAG_CC | CCW_FLAG_DC));
#endif
if (cqr->cpaddr != NULL)
kfree(cqr->cpaddr);
if (cqr->data != NULL)
kfree(cqr->data);
kfree(cqr->cpaddr);
kfree(cqr->data);
kfree(cqr);
dasd_put_device(device);
}
......
......@@ -387,8 +387,7 @@ dasd_add_busid(char *bus_id, int features)
new = 0;
}
spin_unlock(&dasd_devmap_lock);
if (new)
kfree(new);
kfree(new);
return devmap;
}
......
......@@ -727,8 +727,7 @@ raw3215_remove (struct ccw_device *cdev)
raw = cdev->dev.driver_data;
if (raw) {
cdev->dev.driver_data = NULL;
if (raw->buffer)
kfree(raw->buffer);
kfree(raw->buffer);
kfree(raw);
}
}
......
......@@ -99,13 +99,11 @@ out_fn_handler:
kfree(kbd->fn_handler);
out_func:
for (i = 0; i < ARRAY_SIZE(func_table); i++)
if (kbd->func_table[i])
kfree(kbd->func_table[i]);
kfree(kbd->func_table[i]);
kfree(kbd->func_table);
out_maps:
for (i = 0; i < ARRAY_SIZE(key_maps); i++)
if (kbd->key_maps[i])
kfree(kbd->key_maps[i]);
kfree(kbd->key_maps[i]);
kfree(kbd->key_maps);
out_kbd:
kfree(kbd);
......@@ -121,12 +119,10 @@ kbd_free(struct kbd_data *kbd)
kfree(kbd->accent_table);
kfree(kbd->fn_handler);
for (i = 0; i < ARRAY_SIZE(func_table); i++)
if (kbd->func_table[i])
kfree(kbd->func_table[i]);
kfree(kbd->func_table[i]);
kfree(kbd->func_table);
for (i = 0; i < ARRAY_SIZE(key_maps); i++)
if (kbd->key_maps[i])
kfree(kbd->key_maps[i]);
kfree(kbd->key_maps[i]);
kfree(kbd->key_maps);
kfree(kbd);
}
......@@ -452,8 +448,7 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs,
return -EFAULT;
}
p[len] = 0;
if (kbd->func_table[kb_func])
kfree(kbd->func_table[kb_func]);
kfree(kbd->func_table[kb_func]);
kbd->func_table[kb_func] = p;
break;
}
......
......@@ -183,8 +183,7 @@ raw3270_request_alloc_bootmem(size_t size)
void
raw3270_request_free (struct raw3270_request *rq)
{
if (rq->buffer)
kfree(rq->buffer);
kfree(rq->buffer);
kfree(rq);
}
......
......@@ -682,8 +682,7 @@ tape_alloc_request(int cplength, int datasize)
request->cpdata = kmalloc(datasize, GFP_KERNEL | GFP_DMA);
if (request->cpdata == NULL) {
DBF_EXCEPTION(1, "cqra nomem\n");
if (request->cpaddr != NULL)
kfree(request->cpaddr);
kfree(request->cpaddr);
kfree(request);
return ERR_PTR(-ENOMEM);
}
......@@ -706,10 +705,8 @@ tape_free_request (struct tape_request * request)
if (request->device != NULL) {
request->device = tape_put_device(request->device);
}
if (request->cpdata != NULL)
kfree(request->cpdata);
if (request->cpaddr != NULL)
kfree(request->cpaddr);
kfree(request->cpdata);
kfree(request->cpaddr);
kfree(request);
}
......
......@@ -642,8 +642,7 @@ static void
free_cmbe (struct ccw_device *cdev)
{
spin_lock_irq(cdev->ccwlock);
if (cdev->private->cmb)
kfree(cdev->private->cmb);
kfree(cdev->private->cmb);
cdev->private->cmb = NULL;
spin_unlock_irq(cdev->ccwlock);
......
......@@ -550,10 +550,8 @@ ccw_device_stlck(struct ccw_device *cdev)
/* Clear irb. */
memset(&cdev->private->irb, 0, sizeof(struct irb));
out_unlock:
if (buf)
kfree(buf);
if (buf2)
kfree(buf2);
kfree(buf);
kfree(buf2);
spin_unlock_irqrestore(&sch->lock, flags);
return ret;
}
......
......@@ -1338,16 +1338,14 @@ qdio_release_irq_memory(struct qdio_irq *irq_ptr)
if (!irq_ptr->input_qs[i])
goto next;
if (irq_ptr->input_qs[i]->slib)
kfree(irq_ptr->input_qs[i]->slib);
kfree(irq_ptr->input_qs[i]->slib);
kfree(irq_ptr->input_qs[i]);
next:
if (!irq_ptr->output_qs[i])
continue;
if (irq_ptr->output_qs[i]->slib)
kfree(irq_ptr->output_qs[i]->slib);
kfree(irq_ptr->output_qs[i]->slib);
kfree(irq_ptr->output_qs[i]);
}
......@@ -3315,8 +3313,7 @@ qdio_get_qdio_memory(void)
static void
qdio_release_qdio_memory(void)
{
if (indicators)
kfree(indicators);
kfree(indicators);
}
static void
......
......@@ -3051,8 +3051,7 @@ destroy_crypto_device(int index)
if (dev_ptr) {
disabledFlag = dev_ptr->disabled;
t = dev_ptr->dev_type;
if (dev_ptr->dev_resp_p)
kfree(dev_ptr->dev_resp_p);
kfree(dev_ptr->dev_resp_p);
kfree(dev_ptr);
} else {
disabledFlag = 0;
......@@ -3080,11 +3079,11 @@ static void
destroy_z90crypt(void)
{
int i;
for (i = 0; i < z90crypt.max_count; i++)
if (z90crypt.device_p[i])
destroy_crypto_device(i);
if (z90crypt.hdware_info)
kfree((void *)z90crypt.hdware_info);
kfree(z90crypt.hdware_info);
memset((void *)&z90crypt, 0, sizeof(z90crypt));
}
......
......@@ -2743,14 +2743,10 @@ probe_error( struct ccwgroup_device *cgdev)
#endif
privptr=(struct claw_privbk *)cgdev->dev.driver_data;
if (privptr!=NULL) {
if (privptr->p_env != NULL) {
kfree(privptr->p_env);
privptr->p_env=NULL;
}
if (privptr->p_mtc_envelope!=NULL) {
kfree(privptr->p_mtc_envelope);
privptr->p_mtc_envelope=NULL;
}
kfree(privptr->p_env);
privptr->p_env=NULL;
kfree(privptr->p_mtc_envelope);
privptr->p_mtc_envelope=NULL;
kfree(privptr);
privptr=NULL;
}
......@@ -4121,22 +4117,14 @@ claw_remove_device(struct ccwgroup_device *cgdev)
if (cgdev->state == CCWGROUP_ONLINE)
claw_shutdown_device(cgdev);
claw_remove_files(&cgdev->dev);
if (priv->p_mtc_envelope!=NULL) {
kfree(priv->p_mtc_envelope);
priv->p_mtc_envelope=NULL;
}
if (priv->p_env != NULL) {
kfree(priv->p_env);
priv->p_env=NULL;
}
if (priv->channel[0].irb != NULL) {
kfree(priv->channel[0].irb);
priv->channel[0].irb=NULL;
}
if (priv->channel[1].irb != NULL) {
kfree(priv->channel[1].irb);
priv->channel[1].irb=NULL;
}
kfree(priv->p_mtc_envelope);
priv->p_mtc_envelope=NULL;
kfree(priv->p_env);
priv->p_env=NULL;
kfree(priv->channel[0].irb);
priv->channel[0].irb=NULL;
kfree(priv->channel[1].irb);
priv->channel[1].irb=NULL;
kfree(priv);
cgdev->dev.driver_data=NULL;
cgdev->cdev[READ]->dev.driver_data = NULL;
......
......@@ -78,8 +78,7 @@ kfree_fsm(fsm_instance *this)
{
if (this) {
if (this->f) {
if (this->f->jumpmatrix)
kfree(this->f->jumpmatrix);
kfree(this->f->jumpmatrix);
kfree(this->f);
}
kfree(this);
......
......@@ -447,14 +447,10 @@ static void
iucv_exit(void)
{
iucv_retrieve_buffer();
if (iucv_external_int_buffer) {
kfree(iucv_external_int_buffer);
iucv_external_int_buffer = NULL;
}
if (iucv_param_pool) {
kfree(iucv_param_pool);
iucv_param_pool = NULL;
}
kfree(iucv_external_int_buffer);
iucv_external_int_buffer = NULL;
kfree(iucv_param_pool);
iucv_param_pool = NULL;
s390_root_dev_unregister(iucv_root);
bus_unregister(&iucv_bus);
printk(KERN_INFO "IUCV lowlevel driver unloaded\n");
......
......@@ -145,8 +145,7 @@ lcs_free_channel(struct lcs_channel *channel)
LCS_DBF_TEXT(2, setup, "ichfree");
for (cnt = 0; cnt < LCS_NUM_BUFFS; cnt++) {
if (channel->iob[cnt].data != NULL)
kfree(channel->iob[cnt].data);
kfree(channel->iob[cnt].data);
channel->iob[cnt].data = NULL;
}
}
......
......@@ -62,8 +62,7 @@ qeth_eddp_free_context(struct qeth_eddp_context *ctx)
for (i = 0; i < ctx->num_pages; ++i)
free_page((unsigned long)ctx->pages[i]);
kfree(ctx->pages);
if (ctx->elements != NULL)
kfree(ctx->elements);
kfree(ctx->elements);
kfree(ctx);
}
......
......@@ -450,8 +450,7 @@ zfcp_cfdc_dev_ioctl(struct file *file, unsigned int command,
kfree(sg_list);
}
if (sense_data != NULL)
kfree(sense_data);
kfree(sense_data);
return retval;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment