Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: Use vzalloc

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

Joe Perches and committed by
Greg Kroah-Hartman
5b84cc78 4eb28f71

+6 -13
+1 -3
drivers/staging/comedi/drivers.c
··· 470 470 struct page **pages = NULL; 471 471 472 472 async->buf_page_list = 473 - vmalloc(sizeof(struct comedi_buf_page) * n_pages); 473 + vzalloc(sizeof(struct comedi_buf_page) * n_pages); 474 474 if (async->buf_page_list) { 475 - memset(async->buf_page_list, 0, 476 - sizeof(struct comedi_buf_page) * n_pages); 477 475 pages = vmalloc(sizeof(struct page *) * n_pages); 478 476 } 479 477 if (pages) {
+1 -3
drivers/staging/rtl8192e/r8192E_core.c
··· 2283 2283 IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER); 2284 2284 2285 2285 priv->AcmControl = 0; 2286 - priv->pFirmware = (rt_firmware*)vmalloc(sizeof(rt_firmware)); 2287 - if (priv->pFirmware) 2288 - memset(priv->pFirmware, 0, sizeof(rt_firmware)); 2286 + priv->pFirmware = vzalloc(sizeof(rt_firmware)); 2289 2287 2290 2288 /* rx related queue */ 2291 2289 skb_queue_head_init(&priv->rx_queue);
+2 -3
drivers/staging/udlfb/udlfb.c
··· 1163 1163 * But with imperfect damage info we may send pixels over USB 1164 1164 * that were, in fact, unchanged - wasting limited USB bandwidth 1165 1165 */ 1166 - new_back = vmalloc(new_len); 1166 + new_back = vzalloc(new_len); 1167 1167 if (!new_back) 1168 - dl_info("No shadow/backing buffer allcoated\n"); 1168 + dl_info("No shadow/backing buffer allocated\n"); 1169 1169 else { 1170 1170 if (dev->backing_buffer) 1171 1171 vfree(dev->backing_buffer); 1172 1172 dev->backing_buffer = new_back; 1173 - memset(dev->backing_buffer, 0, new_len); 1174 1173 } 1175 1174 } 1176 1175
+1 -2
drivers/staging/xgifb/XGI_main_26.c
··· 2180 2180 2181 2181 #ifndef AGPOFF 2182 2182 if (XGIfb_queuemode == AGP_CMD_QUEUE) { 2183 - agp_info = vmalloc(sizeof(*agp_info)); 2184 - memset((void *)agp_info, 0x00, sizeof(*agp_info)); 2183 + agp_info = vzalloc(sizeof(*agp_info)); 2185 2184 agp_copy_info(agp_info); 2186 2185 2187 2186 agp_backend_acquire();
+1 -2
drivers/staging/zram/zram_drv.c
··· 533 533 } 534 534 535 535 num_pages = zram->disksize >> PAGE_SHIFT; 536 - zram->table = vmalloc(num_pages * sizeof(*zram->table)); 536 + zram->table = vzalloc(num_pages * sizeof(*zram->table)); 537 537 if (!zram->table) { 538 538 pr_err("Error allocating zram address table\n"); 539 539 /* To prevent accessing table entries during cleanup */ ··· 541 541 ret = -ENOMEM; 542 542 goto fail; 543 543 } 544 - memset(zram->table, 0, num_pages * sizeof(*zram->table)); 545 544 546 545 set_capacity(zram->disk, zram->disksize >> SECTOR_SHIFT); 547 546