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

Commit f35119d6 authored by Rakib Mullick's avatar Rakib Mullick Committed by Linus Torvalds
Browse files

drivers: use kzalloc/kcalloc instead of 'kmalloc+memset', where possible 



Signed-off-by: default avatarRakib Mullick <rakib.mullick@gmail.com>
Cc: Jeff Garzik <jgarzik@pobox.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Tejun Heo <tj@kernel.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f1c93e49

drivers/ata/sata_dwc_460ex.c

+1 −2
Original line number Diff line number Diff line
@@ -1642,13 +1642,12 @@ static int sata_dwc_probe(struct platform_device *ofdev) 
	const struct ata_port_info *ppi[] = { &pi, NULL };



	/* Allocate DWC SATA device */

	hsdev = kmalloc(sizeof(*hsdev), GFP_KERNEL);

	hsdev = kzalloc(sizeof(*hsdev), GFP_KERNEL);

	if (hsdev == NULL) {

		dev_err(&ofdev->dev, "kmalloc failed for hsdev\n");

		err = -ENOMEM;

		goto error;

	}

	memset(hsdev, 0, sizeof(*hsdev));



	/* Ioremap SATA registers */

	base = of_iomap(ofdev->dev.of_node, 0);

drivers/gpu/drm/drm_scatter.c

+3 −7
Original line number Diff line number Diff line
@@ -83,30 +83,26 @@ int drm_sg_alloc(struct drm_device *dev, struct drm_scatter_gather * request) 
	if (dev->sg)

		return -EINVAL;



	entry = kmalloc(sizeof(*entry), GFP_KERNEL);

	entry = kzalloc(sizeof(*entry), GFP_KERNEL);

	if (!entry)

		return -ENOMEM;



	memset(entry, 0, sizeof(*entry));

	pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE;

	DRM_DEBUG("size=%ld pages=%ld\n", request->size, pages);



	entry->pages = pages;

	entry->pagelist = kmalloc(pages * sizeof(*entry->pagelist), GFP_KERNEL);

	entry->pagelist = kcalloc(pages, sizeof(*entry->pagelist), GFP_KERNEL);

	if (!entry->pagelist) {

		kfree(entry);

		return -ENOMEM;

	}



	memset(entry->pagelist, 0, pages * sizeof(*entry->pagelist));



	entry->busaddr = kmalloc(pages * sizeof(*entry->busaddr), GFP_KERNEL);

	entry->busaddr = kcalloc(pages, sizeof(*entry->busaddr), GFP_KERNEL);

	if (!entry->busaddr) {

		kfree(entry->pagelist);

		kfree(entry);

		return -ENOMEM;

	}

	memset((void *)entry->busaddr, 0, pages * sizeof(*entry->busaddr));



	entry->virtual = drm_vmalloc_dma(pages << PAGE_SHIFT);

	if (!entry->virtual) {

drivers/gpu/drm/radeon/radeon_mem.c

+1 −2
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int init_heap(struct mem_block **heap, int start, int size) 
	if (!blocks)

		return -ENOMEM;



	*heap = kmalloc(sizeof(**heap), GFP_KERNEL);

	*heap = kzalloc(sizeof(**heap), GFP_KERNEL);

	if (!*heap) {

		kfree(blocks);

		return -ENOMEM;
@@ -150,7 +150,6 @@ static int init_heap(struct mem_block **heap, int start, int size) 
	blocks->file_priv = NULL;

	blocks->next = blocks->prev = *heap;



	memset(*heap, 0, sizeof(**heap));

	(*heap)->file_priv = (struct drm_file *) - 1;

	(*heap)->next = (*heap)->prev = blocks;

	return 0;

drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c

+1 −2
Original line number Diff line number Diff line
@@ -585,11 +585,10 @@ int vmw_overlay_init(struct vmw_private *dev_priv) 
		return -ENOSYS;

	}



	overlay = kmalloc(sizeof(*overlay), GFP_KERNEL);

	overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);

	if (!overlay)

		return -ENOMEM;



	memset(overlay, 0, sizeof(*overlay));

	mutex_init(&overlay->mutex);

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

		overlay->stream[i].buf = NULL;

drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

+3 −5
Original line number Diff line number Diff line
@@ -612,11 +612,9 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, 
	    srf->sizes[0].height == 64 &&

	    srf->format == SVGA3D_A8R8G8B8) {



		srf->snooper.image = kmalloc(64 * 64 * 4, GFP_KERNEL);

		/* clear the image */

		if (srf->snooper.image) {

			memset(srf->snooper.image, 0x00, 64 * 64 * 4);

		} else {

		/* allocate image area and clear it */

		srf->snooper.image = kzalloc(64 * 64 * 4, GFP_KERNEL);

		if (!srf->snooper.image) {

			DRM_ERROR("Failed to allocate cursor_image\n");

			ret = -ENOMEM;

			goto out_err1;