alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ALSA: oss: consolidate kmalloc/memset 0 call to kzalloc
@ 2015-12-18 20:01 Nicholas Mc Guire
  2015-12-18 22:08 ` [alsa-devel] " David Rivshin (Allworx)
  0 siblings, 1 reply; 2+ messages in thread
From: Nicholas Mc Guire @ 2015-12-18 20:01 UTC (permalink / raw)
  To: Jaroslav Kysela
  Cc: Takashi Iwai, Jie Yang, Lars-Peter Clausen, alsa-devel,
	linux-kernel, Nicholas Mc Guire

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>
---

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
@@ -850,7 +850,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 = kmalloc(sizeof(*sw_params), GFP_KERNEL);
 	params = kmalloc(sizeof(*params), GFP_KERNEL);
 	sparams = kmalloc(sizeof(*sparams), GFP_KERNEL);
 	if (!sw_params || !params || !sparams) {
@@ -988,7 +988,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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [alsa-devel] [PATCH] ALSA: oss: consolidate kmalloc/memset 0 call to kzalloc
  2015-12-18 20:01 [PATCH] ALSA: oss: consolidate kmalloc/memset 0 call to kzalloc Nicholas Mc Guire
@ 2015-12-18 22:08 ` David Rivshin (Allworx)
  0 siblings, 0 replies; 2+ messages in thread
From: David Rivshin (Allworx) @ 2015-12-18 22:08 UTC (permalink / raw)
  To: Nicholas Mc Guire
  Cc: Jaroslav Kysela, alsa-devel, Lars-Peter Clausen, Takashi Iwai,
	linux-kernel

On Fri, 18 Dec 2015 21:01:57 +0100
Nicholas Mc Guire <hofrat@osadl.org> 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>
> ---
> 
> 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
> @@ -850,7 +850,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 = kmalloc(sizeof(*sw_params), GFP_KERNEL);
                     ^
Something odd (manual edit?) seems to have happened to this hunk, 
making it a no-op. I presume that 'm' was supposed to be a 'z'.

>  	params = kmalloc(sizeof(*params), GFP_KERNEL);
>  	sparams = kmalloc(sizeof(*sparams), GFP_KERNEL);
>  	if (!sw_params || !params || !sparams) {
> @@ -988,7 +988,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 {

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-12-18 22:08 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-18 20:01 [PATCH] ALSA: oss: consolidate kmalloc/memset 0 call to kzalloc Nicholas Mc Guire
2015-12-18 22:08 ` [alsa-devel] " David Rivshin (Allworx)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).