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

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

drivers/s390/block/dasd.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -115,7 +115,6 @@ dasd_alloc_device(void) 
void

void

dasd_free_device(struct dasd_device *device)

dasd_free_device(struct dasd_device *device)

{

{

	if (device->private)

	kfree(device->private);

	kfree(device->private);

	free_page((unsigned long) device->erp_mem);

	free_page((unsigned long) device->erp_mem);

	free_pages((unsigned long) device->ccw_mem, 1);

	free_pages((unsigned long) device->ccw_mem, 1);
@@ -539,7 +538,6 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize, 
	if (datasize > 0) {

	if (datasize > 0) {

		cqr->data = kmalloc(datasize, GFP_ATOMIC | GFP_DMA);

		cqr->data = kmalloc(datasize, GFP_ATOMIC | GFP_DMA);

		if (cqr->data == NULL) {

		if (cqr->data == NULL) {

			if (cqr->cpaddr != NULL)

			kfree(cqr->cpaddr);

			kfree(cqr->cpaddr);

			kfree(cqr);

			kfree(cqr);

			return ERR_PTR(-ENOMEM);

			return ERR_PTR(-ENOMEM);
@@ -615,9 +613,7 @@ dasd_kfree_request(struct dasd_ccw_req * cqr, struct dasd_device * device) 
		clear_normalized_cda(ccw);

		clear_normalized_cda(ccw);

	} while (ccw++->flags & (CCW_FLAG_CC | CCW_FLAG_DC));

	} while (ccw++->flags & (CCW_FLAG_CC | CCW_FLAG_DC));

#endif

#endif

	if (cqr->cpaddr != NULL)

	kfree(cqr->cpaddr);

	kfree(cqr->cpaddr);

	if (cqr->data != NULL)

	kfree(cqr->data);

	kfree(cqr->data);

	kfree(cqr);

	kfree(cqr);

	dasd_put_device(device);

	dasd_put_device(device);

drivers/s390/block/dasd_devmap.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -387,7 +387,6 @@ dasd_add_busid(char *bus_id, int features) 
		new = 0;

		new = 0;

	}

	}

	spin_unlock(&dasd_devmap_lock);

	spin_unlock(&dasd_devmap_lock);

	if (new)

	kfree(new);

	kfree(new);

	return devmap;

	return devmap;

}

}

drivers/s390/char/con3215.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -727,7 +727,6 @@ raw3215_remove (struct ccw_device *cdev) 
	raw = cdev->dev.driver_data;

	raw = cdev->dev.driver_data;

	if (raw) {

	if (raw) {

		cdev->dev.driver_data = NULL;

		cdev->dev.driver_data = NULL;

		if (raw->buffer)

		kfree(raw->buffer);

		kfree(raw->buffer);

		kfree(raw);

		kfree(raw);

	}

	}

drivers/s390/char/keyboard.c

+5 −10
Original line number Original line Diff line number Diff line
@@ -99,12 +99,10 @@ kbd_alloc(void) { 
	kfree(kbd->fn_handler);

	kfree(kbd->fn_handler);

out_func:

out_func:

	for (i = 0; i < ARRAY_SIZE(func_table); i++)

	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);

	kfree(kbd->func_table);

out_maps:

out_maps:

	for (i = 0; i < ARRAY_SIZE(key_maps); i++)

	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->key_maps);

out_kbd:

out_kbd:
@@ -121,11 +119,9 @@ kbd_free(struct kbd_data *kbd) 
	kfree(kbd->accent_table);

	kfree(kbd->accent_table);

	kfree(kbd->fn_handler);

	kfree(kbd->fn_handler);

	for (i = 0; i < ARRAY_SIZE(func_table); i++)

	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);

	kfree(kbd->func_table);

	for (i = 0; i < ARRAY_SIZE(key_maps); i++)

	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->key_maps);

	kfree(kbd);

	kfree(kbd);
@@ -452,7 +448,6 @@ do_kdgkb_ioctl(struct kbd_data *kbd, struct kbsentry __user *u_kbs, 
			return -EFAULT;

			return -EFAULT;

		}

		}

		p[len] = 0;

		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;

		kbd->func_table[kb_func] = p;

		break;

		break;

drivers/s390/char/raw3270.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -183,7 +183,6 @@ raw3270_request_alloc_bootmem(size_t size) 
void

void

raw3270_request_free (struct raw3270_request *rq)

raw3270_request_free (struct raw3270_request *rq)

{

{

	if (rq->buffer)

	kfree(rq->buffer);

	kfree(rq->buffer);

	kfree(rq);

	kfree(rq);

}

}