From 24b9bdff8d0848029dba1c80b196b43e80b39463 Mon Sep 17 00:00:00 2001 From: Ivan Bornyakov Date: Mon, 23 Jul 2018 21:30:25 +0300 Subject: [PATCH] staging: gasket: use vzalloc instead of vmalloc/memset Use vzalloc instead of vmalloc followed by memset with 0. Signed-off-by: Ivan Bornyakov Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gasket/gasket_page_table.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c index 4f2ff7700658..55ab59303247 100644 --- a/drivers/staging/gasket/gasket_page_table.c +++ b/drivers/staging/gasket/gasket_page_table.c @@ -330,7 +330,7 @@ int gasket_page_table_init( pg_tbl = *ppg_tbl; bytes = total_entries * sizeof(struct gasket_page_table_entry); if (bytes != 0) { - pg_tbl->entries = vmalloc(bytes); + pg_tbl->entries = vzalloc(bytes); if (!pg_tbl->entries) { gasket_nodev_debug( "No memory for address translation metadata."); @@ -338,7 +338,6 @@ int gasket_page_table_init( *ppg_tbl = NULL; return -ENOMEM; } - memset(pg_tbl->entries, 0, bytes); } mutex_init(&pg_tbl->mutex); @@ -1054,13 +1053,12 @@ static int gasket_alloc_extended_subtable( subtable_bytes = sizeof(struct gasket_page_table_entry) * GASKET_PAGES_PER_SUBTABLE; - pte->sublevel = vmalloc(subtable_bytes); + pte->sublevel = vzalloc(subtable_bytes); if (!pte->sublevel) { free_page(page_addr); memset(pte, 0, sizeof(struct gasket_page_table_entry)); return -ENOMEM; } - memset(pte->sublevel, 0, subtable_bytes); /* Map the page into DMA space. */ if (pg_tbl->dma_ops) { -- 2.11.0