Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f35119d6681300ba6d76da53cb1ebc2eed62e77a

Authored by Rakib Mullick
Committed by Linus Torvalds
1 parent f1c93e4946
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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

Signed-off-by: Rakib 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 6 changed files with 10 additions and 20 deletions Side-by-side Diff

drivers/ata/sata_dwc_460ex.c
Diff comments   View file @ f35119d
... ... @@ -1642,13 +1642,12 @@
1642 1642 const struct ata_port_info *ppi[] = { &pi, NULL };
1643 1643  
1644 1644 /* Allocate DWC SATA device */
1645   - hsdev = kmalloc(sizeof(*hsdev), GFP_KERNEL);
  1645 + hsdev = kzalloc(sizeof(*hsdev), GFP_KERNEL);
1646 1646 if (hsdev == NULL) {
1647 1647 dev_err(&ofdev->dev, "kmalloc failed for hsdev\n");
1648 1648 err = -ENOMEM;
1649 1649 goto error;
1650 1650 }
1651   - memset(hsdev, 0, sizeof(*hsdev));
1652 1651  
1653 1652 /* Ioremap SATA registers */
1654 1653 base = of_iomap(ofdev->dev.of_node, 0);
drivers/gpu/drm/drm_scatter.c
Diff comments   View file @ f35119d
... ... @@ -83,30 +83,26 @@
83 83 if (dev->sg)
84 84 return -EINVAL;
85 85  
86   - entry = kmalloc(sizeof(*entry), GFP_KERNEL);
  86 + entry = kzalloc(sizeof(*entry), GFP_KERNEL);
87 87 if (!entry)
88 88 return -ENOMEM;
89 89  
90   - memset(entry, 0, sizeof(*entry));
91 90 pages = (request->size + PAGE_SIZE - 1) / PAGE_SIZE;
92 91 DRM_DEBUG("size=%ld pages=%ld\n", request->size, pages);
93 92  
94 93 entry->pages = pages;
95   - entry->pagelist = kmalloc(pages * sizeof(*entry->pagelist), GFP_KERNEL);
  94 + entry->pagelist = kcalloc(pages, sizeof(*entry->pagelist), GFP_KERNEL);
96 95 if (!entry->pagelist) {
97 96 kfree(entry);
98 97 return -ENOMEM;
99 98 }
100 99  
101   - memset(entry->pagelist, 0, pages * sizeof(*entry->pagelist));
102   -
103   - entry->busaddr = kmalloc(pages * sizeof(*entry->busaddr), GFP_KERNEL);
  100 + entry->busaddr = kcalloc(pages, sizeof(*entry->busaddr), GFP_KERNEL);
104 101 if (!entry->busaddr) {
105 102 kfree(entry->pagelist);
106 103 kfree(entry);
107 104 return -ENOMEM;
108 105 }
109   - memset((void *)entry->busaddr, 0, pages * sizeof(*entry->busaddr));
110 106  
111 107 entry->virtual = drm_vmalloc_dma(pages << PAGE_SHIFT);
112 108 if (!entry->virtual) {
drivers/gpu/drm/radeon/radeon_mem.c
Diff comments   View file @ f35119d
... ... @@ -139,7 +139,7 @@
139 139 if (!blocks)
140 140 return -ENOMEM;
141 141  
142   - *heap = kmalloc(sizeof(**heap), GFP_KERNEL);
  142 + *heap = kzalloc(sizeof(**heap), GFP_KERNEL);
143 143 if (!*heap) {
144 144 kfree(blocks);
145 145 return -ENOMEM;
... ... @@ -150,7 +150,6 @@
150 150 blocks->file_priv = NULL;
151 151 blocks->next = blocks->prev = *heap;
152 152  
153   - memset(*heap, 0, sizeof(**heap));
154 153 (*heap)->file_priv = (struct drm_file *) - 1;
155 154 (*heap)->next = (*heap)->prev = blocks;
156 155 return 0;
drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c
Diff comments   View file @ f35119d
... ... @@ -585,11 +585,10 @@
585 585 return -ENOSYS;
586 586 }
587 587  
588   - overlay = kmalloc(sizeof(*overlay), GFP_KERNEL);
  588 + overlay = kzalloc(sizeof(*overlay), GFP_KERNEL);
589 589 if (!overlay)
590 590 return -ENOMEM;
591 591  
592   - memset(overlay, 0, sizeof(*overlay));
593 592 mutex_init(&overlay->mutex);
594 593 for (i = 0; i < VMW_MAX_NUM_STREAMS; i++) {
595 594 overlay->stream[i].buf = NULL;
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
Diff comments   View file @ f35119d
... ... @@ -612,11 +612,9 @@
612 612 srf->sizes[0].height == 64 &&
613 613 srf->format == SVGA3D_A8R8G8B8) {
614 614  
615   - srf->snooper.image = kmalloc(64 * 64 * 4, GFP_KERNEL);
616   - /* clear the image */
617   - if (srf->snooper.image) {
618   - memset(srf->snooper.image, 0x00, 64 * 64 * 4);
619   - } else {
  615 + /* allocate image area and clear it */
  616 + srf->snooper.image = kzalloc(64 * 64 * 4, GFP_KERNEL);
  617 + if (!srf->snooper.image) {
620 618 DRM_ERROR("Failed to allocate cursor_image\n");
621 619 ret = -ENOMEM;
622 620 goto out_err1;
drivers/gpu/vga/vgaarb.c
Diff comments   View file @ f35119d
... ... @@ -1171,10 +1171,9 @@
1171 1171  
1172 1172 pr_debug("%s\n", __func__);
1173 1173  
1174   - priv = kmalloc(sizeof(struct vga_arb_private), GFP_KERNEL);
  1174 + priv = kzalloc(sizeof(*priv), GFP_KERNEL);
1175 1175 if (priv == NULL)
1176 1176 return -ENOMEM;
1177   - memset(priv, 0, sizeof(*priv));
1178 1177 spin_lock_init(&priv->lock);
1179 1178 file->private_data = priv;
1180 1179