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

Commit 88abaab4 authored by Eric Sesterhenn's avatar Eric Sesterhenn Committed by Linus Torvalds
Browse files

[PATCH] s390: kzalloc() conversion in drivers/s390 



Convert all kmalloc + memset sequences in drivers/s390 to kzalloc usage.

Signed-off-by: default avatarEric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent fb630517

drivers/s390/block/dasd.c

+4 −8
Original line number Diff line number Diff line
@@ -71,10 +71,9 @@ dasd_alloc_device(void) 
{

	struct dasd_device *device;



	device = kmalloc(sizeof (struct dasd_device), GFP_ATOMIC);

	device = kzalloc(sizeof (struct dasd_device), GFP_ATOMIC);

	if (device == NULL)

		return ERR_PTR(-ENOMEM);

	memset(device, 0, sizeof (struct dasd_device));

	/* open_count = 0 means device online but not in use */

	atomic_set(&device->open_count, -1);
@@ -547,29 +546,26 @@ dasd_kmalloc_request(char *magic, int cplength, int datasize, 
	     (cplength*sizeof(struct ccw1)) > PAGE_SIZE)

		BUG();



	cqr = kmalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);

	cqr = kzalloc(sizeof(struct dasd_ccw_req), GFP_ATOMIC);

	if (cqr == NULL)

		return ERR_PTR(-ENOMEM);

	memset(cqr, 0, sizeof(struct dasd_ccw_req));

	cqr->cpaddr = NULL;

	if (cplength > 0) {

		cqr->cpaddr = kmalloc(cplength*sizeof(struct ccw1),

		cqr->cpaddr = kcalloc(cplength, sizeof(struct ccw1),

				      GFP_ATOMIC | GFP_DMA);

		if (cqr->cpaddr == NULL) {

			kfree(cqr);

			return ERR_PTR(-ENOMEM);

		}

		memset(cqr->cpaddr, 0, cplength*sizeof(struct ccw1));

	}

	cqr->data = NULL;

	if (datasize > 0) {

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

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

		if (cqr->data == NULL) {

			kfree(cqr->cpaddr);

			kfree(cqr);

			return ERR_PTR(-ENOMEM);

		}

		memset(cqr->data, 0, datasize);

	}

	strncpy((char *) &cqr->magic, magic, 4);

	ASCEBC((char *) &cqr->magic, 4);

drivers/s390/block/dcssblk.c

+1 −2
Original line number Diff line number Diff line
@@ -388,12 +388,11 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char 
	/*

	 * get a struct dcssblk_dev_info

	 */

	dev_info = kmalloc(sizeof(struct dcssblk_dev_info), GFP_KERNEL);

	dev_info = kzalloc(sizeof(struct dcssblk_dev_info), GFP_KERNEL);

	if (dev_info == NULL) {

		rc = -ENOMEM;

		goto out;

	}

	memset(dev_info, 0, sizeof(struct dcssblk_dev_info));



	strcpy(dev_info->segment_name, local_buf);

	strlcpy(dev_info->dev.bus_id, local_buf, BUS_ID_SIZE);

drivers/s390/char/fs3270.c

+1 −2
Original line number Diff line number Diff line
@@ -368,10 +368,9 @@ fs3270_alloc_view(void) 
{

	struct fs3270 *fp;



	fp = (struct fs3270 *) kmalloc(sizeof(struct fs3270),GFP_KERNEL);

	fp = kzalloc(sizeof(struct fs3270),GFP_KERNEL);

	if (!fp)

		return ERR_PTR(-ENOMEM);

	memset(fp, 0, sizeof(struct fs3270));

	fp->init = raw3270_request_alloc(0);

	if (IS_ERR(fp->init)) {

		kfree(fp);

drivers/s390/char/keyboard.c

+4 −8
Original line number Diff line number Diff line
@@ -50,14 +50,12 @@ kbd_alloc(void) { 
	struct kbd_data *kbd;

	int i, len;



	kbd = kmalloc(sizeof(struct kbd_data), GFP_KERNEL);

	kbd = kzalloc(sizeof(struct kbd_data), GFP_KERNEL);

	if (!kbd)

		goto out;

	memset(kbd, 0, sizeof(struct kbd_data));

	kbd->key_maps = kmalloc(sizeof(key_maps), GFP_KERNEL);

	kbd->key_maps = kzalloc(sizeof(key_maps), GFP_KERNEL);

	if (!key_maps)

		goto out_kbd;

	memset(kbd->key_maps, 0, sizeof(key_maps));

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

		if (key_maps[i]) {

			kbd->key_maps[i] =
@@ -68,10 +66,9 @@ kbd_alloc(void) { 
			       sizeof(u_short)*NR_KEYS);

		}

	}

	kbd->func_table = kmalloc(sizeof(func_table), GFP_KERNEL);

	kbd->func_table = kzalloc(sizeof(func_table), GFP_KERNEL);

	if (!kbd->func_table)

		goto out_maps;

	memset(kbd->func_table, 0, sizeof(func_table));

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

		if (func_table[i]) {

			len = strlen(func_table[i]) + 1;
@@ -82,10 +79,9 @@ kbd_alloc(void) { 
		}

	}

	kbd->fn_handler =

		kmalloc(sizeof(fn_handler_fn *) * NR_FN_HANDLER, GFP_KERNEL);

		kzalloc(sizeof(fn_handler_fn *) * NR_FN_HANDLER, GFP_KERNEL);

	if (!kbd->fn_handler)

		goto out_func;

	memset(kbd->fn_handler, 0, sizeof(fn_handler_fn *) * NR_FN_HANDLER);

	kbd->accent_table =

		kmalloc(sizeof(struct kbdiacr)*MAX_DIACR, GFP_KERNEL);

	if (!kbd->accent_table)

drivers/s390/char/monreader.c

+2 −4
Original line number Diff line number Diff line
@@ -257,14 +257,13 @@ mon_alloc_mem(void) 
	int i,j;

	struct mon_private *monpriv;



	monpriv = kmalloc(sizeof(struct mon_private), GFP_KERNEL);

	monpriv = kzalloc(sizeof(struct mon_private), GFP_KERNEL);

	if (!monpriv) {

		P_ERROR("no memory for monpriv\n");

		return NULL;

	}

	memset(monpriv, 0, sizeof(struct mon_private));

	for (i = 0; i < MON_MSGLIM; i++) {

		monpriv->msg_array[i] = kmalloc(sizeof(struct mon_msg),

		monpriv->msg_array[i] = kzalloc(sizeof(struct mon_msg),

						    GFP_KERNEL);

		if (!monpriv->msg_array[i]) {

			P_ERROR("open, no memory for msg_array\n");
@@ -272,7 +271,6 @@ mon_alloc_mem(void) 
				kfree(monpriv->msg_array[j]);

			return NULL;

		}

		memset(monpriv->msg_array[i], 0, sizeof(struct mon_msg));

	}

	return monpriv;

}