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

Commit 6ebc22e6 authored by Julia Lawall's avatar Julia Lawall Committed by Dave Airlie
Browse files

drivers/gpu/drm: Use kzalloc 

Use kzalloc rather than the combination of kmalloc and memset.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@@
expression x,size,flags;
statement S;
@@

-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
 if (x == NULL) S
-memset(x, 0, size);
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Reviewed-by: default avatarCorbin Simpson <MostAwesomeDude@gmail.com>
Reviewed-by: default avatarMatt Turner <mattst88@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 96525a2f

drivers/gpu/drm/drm_auth.c

+1 −2
Original line number Diff line number Diff line
@@ -79,10 +79,9 @@ static int drm_add_magic(struct drm_master *master, struct drm_file *priv, 
	struct drm_device *dev = master->minor->dev;

	DRM_DEBUG("%d\n", magic);



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

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

	if (!entry)

		return -ENOMEM;

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

	entry->priv = priv;

	entry->hash_item.key = (unsigned long)magic;

	mutex_lock(&dev->struct_mutex);

drivers/gpu/drm/drm_dma.c

+1 −3
Original line number Diff line number Diff line
@@ -47,12 +47,10 @@ int drm_dma_setup(struct drm_device *dev) 
{

	int i;



	dev->dma = kmalloc(sizeof(*dev->dma), GFP_KERNEL);

	dev->dma = kzalloc(sizeof(*dev->dma), GFP_KERNEL);

	if (!dev->dma)

		return -ENOMEM;



	memset(dev->dma, 0, sizeof(*dev->dma));



	for (i = 0; i <= DRM_MAX_ORDER; i++)

		memset(&dev->dma->bufs[i], 0, sizeof(dev->dma->bufs[0]));

drivers/gpu/drm/drm_fops.c

+1 −2
Original line number Diff line number Diff line
@@ -243,11 +243,10 @@ static int drm_open_helper(struct inode *inode, struct file *filp, 


	DRM_DEBUG("pid = %d, minor = %d\n", task_pid_nr(current), minor_id);



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

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

	if (!priv)

		return -ENOMEM;



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

	filp->private_data = priv;

	priv->filp = filp;

	priv->uid = current_euid();

drivers/gpu/drm/savage/savage_bci.c

+1 −2
Original line number Diff line number Diff line
@@ -539,11 +539,10 @@ int savage_driver_load(struct drm_device *dev, unsigned long chipset) 
{

	drm_savage_private_t *dev_priv;



	dev_priv = kmalloc(sizeof(drm_savage_private_t), GFP_KERNEL);

	dev_priv = kzalloc(sizeof(drm_savage_private_t), GFP_KERNEL);

	if (dev_priv == NULL)

		return -ENOMEM;



	memset(dev_priv, 0, sizeof(drm_savage_private_t));

	dev->dev_private = (void *)dev_priv;



	dev_priv->chipset = (enum savage_family)chipset;