From cadcec76ef1f167c628dcc59d6dfca257a56640b Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 28 May 2020 09:17:28 +0200 Subject: [PATCH] media: atomisp: avoid an extra memset() when alloc memory Use the variant which zeroes the memory when allocating, instead of having an explicit memset. Signed-off-by: Mauro Carvalho Chehab --- drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c | 3 +-- drivers/staging/media/atomisp/pci/sh_css.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c index ebf36f7a514f..feacd8f12b14 100644 --- a/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c +++ b/drivers/staging/media/atomisp/pci/runtime/pipeline/src/pipeline.c @@ -593,12 +593,11 @@ static enum ia_css_err pipeline_stage_create( out_frame[i] = stage_desc->out_frame[i]; } - stage = kvmalloc(sizeof(*stage), GFP_KERNEL); + stage = kvzalloc(sizeof(*stage), GFP_KERNEL); if (!stage) { err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; goto ERR; } - memset(stage, 0, sizeof(*stage)); if (firmware) { stage->binary = NULL; diff --git a/drivers/staging/media/atomisp/pci/sh_css.c b/drivers/staging/media/atomisp/pci/sh_css.c index 35093c5d7da5..fccba2aa98ed 100644 --- a/drivers/staging/media/atomisp/pci/sh_css.c +++ b/drivers/staging/media/atomisp/pci/sh_css.c @@ -9400,7 +9400,7 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, } /* allocate the stream instance */ - curr_stream = kmalloc(sizeof(struct ia_css_stream), GFP_KERNEL); + curr_stream = kzalloc(sizeof(struct ia_css_stream), GFP_KERNEL); if (!curr_stream) { err = IA_CSS_ERR_CANNOT_ALLOCATE_MEMORY; @@ -9408,7 +9408,6 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, return err; } /* default all to 0 */ - memset(curr_stream, 0, sizeof(struct ia_css_stream)); curr_stream->info.metadata_info = md_info; /* allocate pipes */ -- 2.11.0