Skip to content

Commit

Permalink
drivers/gpu/drm: Use kzalloc
Browse files Browse the repository at this point in the history
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: Julia Lawall <julia@diku.dk>
Reviewed-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Julia Lawall authored and Dave Airlie committed May 18, 2010
1 parent 96525a2 commit 6ebc22e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/drm_auth.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 1 addition & 3 deletions drivers/gpu/drm/drm_dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]));

Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/drm_fops.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 1 addition & 2 deletions drivers/gpu/drm/savage/savage_bci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6ebc22e

Please sign in to comment.