mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] ALSA: usb-audio: Use kmemdup rather than duplicating its implementation
@ 2011-11-10 18:38 Thomas Meyer
  2011-11-10 18:53 ` Takashi Iwai
  0 siblings, 1 reply; 2+ messages in thread
From: Thomas Meyer @ 2011-11-10 18:38 UTC (permalink / raw)
  To: Jaroslav Kysela, Takashi Iwai, linux-kernel

Use kmemdup rather than duplicating its implementation

The semantic patch that makes this change is available
in scripts/coccinelle/api/memdup.cocci.

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
---

diff -u -p a/sound/usb/quirks.c b/sound/usb/quirks.c
--- a/sound/usb/quirks.c 2011-11-07 19:38:37.987378553 +0100
+++ b/sound/usb/quirks.c 2011-11-08 11:06:23.015258350 +0100
@@ -137,12 +137,12 @@ static int create_fixed_stream_quirk(str
 		return -ENOMEM;
 	}
 	if (fp->nr_rates > 0) {
-		rate_table = kmalloc(sizeof(int) * fp->nr_rates, GFP_KERNEL);
+		rate_table = kmemdup(fp->rate_table,
+				     sizeof(int) * fp->nr_rates, GFP_KERNEL);
 		if (!rate_table) {
 			kfree(fp);
 			return -ENOMEM;
 		}
-		memcpy(rate_table, fp->rate_table, sizeof(int) * fp->nr_rates);
 		fp->rate_table = rate_table;
 	}
 
@@ -224,10 +224,9 @@ static int create_uaxx_quirk(struct snd_
 	if (altsd->bNumEndpoints != 1)
 		return -ENXIO;
 
-	fp = kmalloc(sizeof(*fp), GFP_KERNEL);
+	fp = kmemdup(&ua_format, sizeof(*fp), GFP_KERNEL);
 	if (!fp)
 		return -ENOMEM;
-	memcpy(fp, &ua_format, sizeof(*fp));
 
 	fp->iface = altsd->bInterfaceNumber;
 	fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;
.


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

* Re: [PATCH] ALSA: usb-audio: Use kmemdup rather than duplicating its implementation
  2011-11-10 18:38 [PATCH] ALSA: usb-audio: Use kmemdup rather than duplicating its implementation Thomas Meyer
@ 2011-11-10 18:53 ` Takashi Iwai
  0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2011-11-10 18:53 UTC (permalink / raw)
  To: Thomas Meyer; +Cc: Jaroslav Kysela, linux-kernel

At Thu, 10 Nov 2011 19:38:43 +0100,
Thomas Meyer wrote:
> 
> Use kmemdup rather than duplicating its implementation
> 
> The semantic patch that makes this change is available
> in scripts/coccinelle/api/memdup.cocci.
> 
> Signed-off-by: Thomas Meyer <thomas@m3y3r.de>

Thanks, applied now.


Takashi

> ---
> 
> diff -u -p a/sound/usb/quirks.c b/sound/usb/quirks.c
> --- a/sound/usb/quirks.c 2011-11-07 19:38:37.987378553 +0100
> +++ b/sound/usb/quirks.c 2011-11-08 11:06:23.015258350 +0100
> @@ -137,12 +137,12 @@ static int create_fixed_stream_quirk(str
>  		return -ENOMEM;
>  	}
>  	if (fp->nr_rates > 0) {
> -		rate_table = kmalloc(sizeof(int) * fp->nr_rates, GFP_KERNEL);
> +		rate_table = kmemdup(fp->rate_table,
> +				     sizeof(int) * fp->nr_rates, GFP_KERNEL);
>  		if (!rate_table) {
>  			kfree(fp);
>  			return -ENOMEM;
>  		}
> -		memcpy(rate_table, fp->rate_table, sizeof(int) * fp->nr_rates);
>  		fp->rate_table = rate_table;
>  	}
>  
> @@ -224,10 +224,9 @@ static int create_uaxx_quirk(struct snd_
>  	if (altsd->bNumEndpoints != 1)
>  		return -ENXIO;
>  
> -	fp = kmalloc(sizeof(*fp), GFP_KERNEL);
> +	fp = kmemdup(&ua_format, sizeof(*fp), GFP_KERNEL);
>  	if (!fp)
>  		return -ENOMEM;
> -	memcpy(fp, &ua_format, sizeof(*fp));
>  
>  	fp->iface = altsd->bInterfaceNumber;
>  	fp->endpoint = get_endpoint(alts, 0)->bEndpointAddress;
> .
> 

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

end of thread, other threads:[~2011-11-10 18:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-10 18:38 [PATCH] ALSA: usb-audio: Use kmemdup rather than duplicating its implementation Thomas Meyer
2011-11-10 18:53 ` Takashi Iwai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®