lkml.org 
[lkml]   [2015]   [Dec]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH V2] ALSA: oss: consolidate kmalloc/memset 0 call to kzalloc
On Sat, 19 Dec 2015 15:23:13 +0100,
Nicholas Mc Guire wrote:
>
> This is an API consolidation only. The use of kmalloc + memset to 0
> is equivalent to kzalloc.
>
> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>

Applied, thanks.


Takashi

> ---
>
> V2: somehow managed to insert exactly the same line being removed
> so this time actually do the intended kmalloc->kzalloc replacement
>
> Found by coccinelle script (relaxed version of
> scripts/coccinelle/api/alloc/kzalloc-simple.cocci)
>
> Patch was compile tested with: x86_64_defconfig
> CONFIG_SND_PCM_OSS=y
>
> Patch is against linux-next (localversion-next is -next-20150518)
>
> diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
> index e557dbe..8cdd06f 100644
> --- a/sound/core/oss/pcm_oss.c
> +++ b/sound/core/oss/pcm_oss.c
> @@ -851,7 +851,7 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)
>
> if (mutex_lock_interruptible(&runtime->oss.params_lock))
> return -EINTR;
> - sw_params = kmalloc(sizeof(*sw_params), GFP_KERNEL);
> + sw_params = kzalloc(sizeof(*sw_params), GFP_KERNEL);
> params = kmalloc(sizeof(*params), GFP_KERNEL);
> sparams = kmalloc(sizeof(*sparams), GFP_KERNEL);
> if (!sw_params || !params || !sparams) {
> @@ -989,7 +989,6 @@ static int snd_pcm_oss_change_params(struct snd_pcm_substream *substream)
> goto failure;
> }
>
> - memset(sw_params, 0, sizeof(*sw_params));
> if (runtime->oss.trigger) {
> sw_params->start_threshold = 1;
> } else {
> --
> 1.7.10.4
>
>


\
 
 \ /
  Last update: 2015-12-20 22:41    [W:0.025 / U:0.200 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site