diff options
author | Julia Lawall <julia@diku.dk> | 2010-05-13 15:58:56 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-05-18 01:57:05 -0400 |
commit | 6ebc22e6d06760466859b79d7b3b3edad264a230 (patch) | |
tree | c55bcec8359e666a625b9108a7375f18c7f5c4b7 | |
parent | 96525a2f7448c427bb8d99240907a6bd2d9e818c (diff) |
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: 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>
-rw-r--r-- | drivers/gpu/drm/drm_auth.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_dma.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_fops.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/savage/savage_bci.c | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/drivers/gpu/drm/drm_auth.c b/drivers/gpu/drm/drm_auth.c index 932b5aa96a67..3f46772f0cb2 100644 --- a/drivers/gpu/drm/drm_auth.c +++ b/drivers/gpu/drm/drm_auth.c | |||
@@ -79,10 +79,9 @@ static int drm_add_magic(struct drm_master *master, struct drm_file *priv, | |||
79 | struct drm_device *dev = master->minor->dev; | 79 | struct drm_device *dev = master->minor->dev; |
80 | DRM_DEBUG("%d\n", magic); | 80 | DRM_DEBUG("%d\n", magic); |
81 | 81 | ||
82 | entry = kmalloc(sizeof(*entry), GFP_KERNEL); | 82 | entry = kzalloc(sizeof(*entry), GFP_KERNEL); |
83 | if (!entry) | 83 | if (!entry) |
84 | return -ENOMEM; | 84 | return -ENOMEM; |
85 | memset(entry, 0, sizeof(*entry)); | ||
86 | entry->priv = priv; | 85 | entry->priv = priv; |
87 | entry->hash_item.key = (unsigned long)magic; | 86 | entry->hash_item.key = (unsigned long)magic; |
88 | mutex_lock(&dev->struct_mutex); | 87 | mutex_lock(&dev->struct_mutex); |
diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c index 13f1537413fb..252cbd74df0e 100644 --- a/drivers/gpu/drm/drm_dma.c +++ b/drivers/gpu/drm/drm_dma.c | |||
@@ -47,12 +47,10 @@ int drm_dma_setup(struct drm_device *dev) | |||
47 | { | 47 | { |
48 | int i; | 48 | int i; |
49 | 49 | ||
50 | dev->dma = kmalloc(sizeof(*dev->dma), GFP_KERNEL); | 50 | dev->dma = kzalloc(sizeof(*dev->dma), GFP_KERNEL); |
51 | if (!dev->dma) | 51 | if (!dev->dma) |
52 | return -ENOMEM; | 52 | return -ENOMEM; |
53 | 53 | ||
54 | memset(dev->dma, 0, sizeof(*dev->dma)); | ||
55 | |||
56 | for (i = 0; i <= DRM_MAX_ORDER; i++) | 54 | for (i = 0; i <= DRM_MAX_ORDER; i++) |
57 | memset(&dev->dma->bufs[i], 0, sizeof(dev->dma->bufs[0])); | 55 | memset(&dev->dma->bufs[i], 0, sizeof(dev->dma->bufs[0])); |
58 | 56 | ||
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index 9d532d7fdf59..e7aace20981f 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c | |||
@@ -243,11 +243,10 @@ static int drm_open_helper(struct inode *inode, struct file *filp, | |||
243 | 243 | ||
244 | DRM_DEBUG("pid = %d, minor = %d\n", task_pid_nr(current), minor_id); | 244 | DRM_DEBUG("pid = %d, minor = %d\n", task_pid_nr(current), minor_id); |
245 | 245 | ||
246 | priv = kmalloc(sizeof(*priv), GFP_KERNEL); | 246 | priv = kzalloc(sizeof(*priv), GFP_KERNEL); |
247 | if (!priv) | 247 | if (!priv) |
248 | return -ENOMEM; | 248 | return -ENOMEM; |
249 | 249 | ||
250 | memset(priv, 0, sizeof(*priv)); | ||
251 | filp->private_data = priv; | 250 | filp->private_data = priv; |
252 | priv->filp = filp; | 251 | priv->filp = filp; |
253 | priv->uid = current_euid(); | 252 | priv->uid = current_euid(); |
diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c index bff6fc2524c8..2d0c9ca484c5 100644 --- a/drivers/gpu/drm/savage/savage_bci.c +++ b/drivers/gpu/drm/savage/savage_bci.c | |||
@@ -539,11 +539,10 @@ int savage_driver_load(struct drm_device *dev, unsigned long chipset) | |||
539 | { | 539 | { |
540 | drm_savage_private_t *dev_priv; | 540 | drm_savage_private_t *dev_priv; |
541 | 541 | ||
542 | dev_priv = kmalloc(sizeof(drm_savage_private_t), GFP_KERNEL); | 542 | dev_priv = kzalloc(sizeof(drm_savage_private_t), GFP_KERNEL); |
543 | if (dev_priv == NULL) | 543 | if (dev_priv == NULL) |
544 | return -ENOMEM; | 544 | return -ENOMEM; |
545 | 545 | ||
546 | memset(dev_priv, 0, sizeof(drm_savage_private_t)); | ||
547 | dev->dev_private = (void *)dev_priv; | 546 | dev->dev_private = (void *)dev_priv; |
548 | 547 | ||
549 | dev_priv->chipset = (enum savage_family)chipset; | 548 | dev_priv->chipset = (enum savage_family)chipset; |