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

Commit 94e3370e authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Dave Airlie
Browse files

DRM: Replace kmalloc/memset combos with kzalloc 



Currently most, if not all, memory allocation in drm_bufs.c is followed by initializing the memory with 0.

Replace the use of kmalloc+memset with kzalloc.

Signed-off-by: default avatarDavidlohr Bueso <dave@gnu.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 7203425a

drivers/gpu/drm/drm_bufs.c

+11 −22
Original line number Diff line number Diff line
@@ -328,14 +328,13 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, 
		return -EINVAL;

	}



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

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

	if (!list) {

		if (map->type == _DRM_REGISTERS)

			iounmap(map->handle);

		kfree(map);

		return -EINVAL;

	}

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

	list->map = map;



	mutex_lock(&dev->struct_mutex);
@@ -678,13 +677,12 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) 
		return -EINVAL;

	}



	entry->buflist = kmalloc(count * sizeof(*entry->buflist), GFP_KERNEL);

	entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL);

	if (!entry->buflist) {

		mutex_unlock(&dev->struct_mutex);

		atomic_dec(&dev->buf_alloc);

		return -ENOMEM;

	}

	memset(entry->buflist, 0, count * sizeof(*entry->buflist));



	entry->buf_size = size;

	entry->page_order = page_order;
@@ -708,7 +706,7 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) 
		buf->file_priv = NULL;



		buf->dev_priv_size = dev->driver->dev_priv_size;

		buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL);

		buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL);

		if (!buf->dev_private) {

			/* Set count correctly so we free the proper amount. */

			entry->buf_count = count;
@@ -717,7 +715,6 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request) 
			atomic_dec(&dev->buf_alloc);

			return -ENOMEM;

		}

		memset(buf->dev_private, 0, buf->dev_priv_size);



		DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);
@@ -832,22 +829,20 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) 
		return -EINVAL;

	}



	entry->buflist = kmalloc(count * sizeof(*entry->buflist), GFP_KERNEL);

	entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL);

	if (!entry->buflist) {

		mutex_unlock(&dev->struct_mutex);

		atomic_dec(&dev->buf_alloc);

		return -ENOMEM;

	}

	memset(entry->buflist, 0, count * sizeof(*entry->buflist));



	entry->seglist = kmalloc(count * sizeof(*entry->seglist), GFP_KERNEL);

	entry->seglist = kzalloc(count * sizeof(*entry->seglist), GFP_KERNEL);

	if (!entry->seglist) {

		kfree(entry->buflist);

		mutex_unlock(&dev->struct_mutex);

		atomic_dec(&dev->buf_alloc);

		return -ENOMEM;

	}

	memset(entry->seglist, 0, count * sizeof(*entry->seglist));



	/* Keep the original pagelist until we know all the allocations

	 * have succeeded
@@ -911,7 +906,7 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) 
			buf->file_priv = NULL;



			buf->dev_priv_size = dev->driver->dev_priv_size;

			buf->dev_private = kmalloc(buf->dev_priv_size,

			buf->dev_private = kzalloc(buf->dev_priv_size,

						GFP_KERNEL);

			if (!buf->dev_private) {

				/* Set count correctly so we free the proper amount. */
@@ -923,7 +918,6 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request) 
				atomic_dec(&dev->buf_alloc);

				return -ENOMEM;

			}

			memset(buf->dev_private, 0, buf->dev_priv_size);



			DRM_DEBUG("buffer %d @ %p\n",

				  entry->buf_count, buf->address);
@@ -1048,14 +1042,13 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request 
		return -EINVAL;

	}



	entry->buflist = kmalloc(count * sizeof(*entry->buflist),

	entry->buflist = kzalloc(count * sizeof(*entry->buflist),

				GFP_KERNEL);

	if (!entry->buflist) {

		mutex_unlock(&dev->struct_mutex);

		atomic_dec(&dev->buf_alloc);

		return -ENOMEM;

	}

	memset(entry->buflist, 0, count * sizeof(*entry->buflist));



	entry->buf_size = size;

	entry->page_order = page_order;
@@ -1080,7 +1073,7 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request 
		buf->file_priv = NULL;



		buf->dev_priv_size = dev->driver->dev_priv_size;

		buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL);

		buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL);

		if (!buf->dev_private) {

			/* Set count correctly so we free the proper amount. */

			entry->buf_count = count;
@@ -1090,8 +1083,6 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request 
			return -ENOMEM;

		}



		memset(buf->dev_private, 0, buf->dev_priv_size);



		DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);



		offset += alignment;
@@ -1209,14 +1200,13 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request 
		return -EINVAL;

	}



	entry->buflist = kmalloc(count * sizeof(*entry->buflist),

	entry->buflist = kzalloc(count * sizeof(*entry->buflist),

				GFP_KERNEL);

	if (!entry->buflist) {

		mutex_unlock(&dev->struct_mutex);

		atomic_dec(&dev->buf_alloc);

		return -ENOMEM;

	}

	memset(entry->buflist, 0, count * sizeof(*entry->buflist));



	entry->buf_size = size;

	entry->page_order = page_order;
@@ -1240,7 +1230,7 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request 
		buf->file_priv = NULL;



		buf->dev_priv_size = dev->driver->dev_priv_size;

		buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL);

		buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL);

		if (!buf->dev_private) {

			/* Set count correctly so we free the proper amount. */

			entry->buf_count = count;
@@ -1249,7 +1239,6 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request 
			atomic_dec(&dev->buf_alloc);

			return -ENOMEM;

		}

		memset(buf->dev_private, 0, buf->dev_priv_size);



		DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);