* [PATCH] sound: oss: uart401: Used kmemdup instead of kmalloc and memcpy
@ 2013-03-25 13:46 Alexandru Gheorghiu
2013-04-02 9:23 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Alexandru Gheorghiu @ 2013-03-25 13:46 UTC (permalink / raw)
To: Jaroslav Kysela
Cc: Takashi Iwai, alsa-devel, linux-kernel, Alexandru Gheorghiu
Used kmemdup instead of replicating it's behaviour with kmalloc followed
by memcpy.
Patch found using coccinelle.
Signed-off-by: Alexandru Gheorghiu <gheorghiuandru@gmail.com>
---
sound/oss/uart401.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/sound/oss/uart401.c b/sound/oss/uart401.c
index 8e514a6..5433c6f 100644
--- a/sound/oss/uart401.c
+++ b/sound/oss/uart401.c
@@ -352,23 +352,26 @@ int probe_uart401(struct address_info *hw_config, struct module *owner)
goto cleanup_irq;
}
conf_printf(name, hw_config);
- midi_devs[devc->my_dev] = kmalloc(sizeof(struct midi_operations), GFP_KERNEL);
+ midi_devs[devc->my_dev] = kmemdup(&uart401_operations,
+ sizeof(struct midi_operations),
+ GFP_KERNEL);
if (!midi_devs[devc->my_dev]) {
printk(KERN_ERR "uart401: Failed to allocate memory\n");
goto cleanup_unload_mididev;
}
- memcpy(midi_devs[devc->my_dev], &uart401_operations, sizeof(struct midi_operations));
if (owner)
midi_devs[devc->my_dev]->owner = owner;
midi_devs[devc->my_dev]->devc = devc;
- midi_devs[devc->my_dev]->converter = kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
+ midi_devs[devc->my_dev]->converter = kmemdup(&std_midi_synth,
+ sizeof(struct synth_operations),
+ GFP_KERNEL);
+
if (!midi_devs[devc->my_dev]->converter) {
printk(KERN_WARNING "uart401: Failed to allocate memory\n");
goto cleanup_midi_devs;
}
- memcpy(midi_devs[devc->my_dev]->converter, &std_midi_synth, sizeof(struct synth_operations));
strcpy(midi_devs[devc->my_dev]->info.name, name);
midi_devs[devc->my_dev]->converter->id = "UART401";
midi_devs[devc->my_dev]->converter->midi_dev = devc->my_dev;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] sound: oss: uart401: Used kmemdup instead of kmalloc and memcpy
2013-03-25 13:46 [PATCH] sound: oss: uart401: Used kmemdup instead of kmalloc and memcpy Alexandru Gheorghiu
@ 2013-04-02 9:23 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2013-04-02 9:23 UTC (permalink / raw)
To: Alexandru Gheorghiu; +Cc: Jaroslav Kysela, alsa-devel, linux-kernel
At Mon, 25 Mar 2013 15:46:49 +0200,
Alexandru Gheorghiu wrote:
>
> Used kmemdup instead of replicating it's behaviour with kmalloc followed
> by memcpy.
> Patch found using coccinelle.
>
> Signed-off-by: Alexandru Gheorghiu <gheorghiuandru@gmail.com>
Thanks, applied.
Takashi
> ---
> sound/oss/uart401.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/sound/oss/uart401.c b/sound/oss/uart401.c
> index 8e514a6..5433c6f 100644
> --- a/sound/oss/uart401.c
> +++ b/sound/oss/uart401.c
> @@ -352,23 +352,26 @@ int probe_uart401(struct address_info *hw_config, struct module *owner)
> goto cleanup_irq;
> }
> conf_printf(name, hw_config);
> - midi_devs[devc->my_dev] = kmalloc(sizeof(struct midi_operations), GFP_KERNEL);
> + midi_devs[devc->my_dev] = kmemdup(&uart401_operations,
> + sizeof(struct midi_operations),
> + GFP_KERNEL);
> if (!midi_devs[devc->my_dev]) {
> printk(KERN_ERR "uart401: Failed to allocate memory\n");
> goto cleanup_unload_mididev;
> }
> - memcpy(midi_devs[devc->my_dev], &uart401_operations, sizeof(struct midi_operations));
>
> if (owner)
> midi_devs[devc->my_dev]->owner = owner;
>
> midi_devs[devc->my_dev]->devc = devc;
> - midi_devs[devc->my_dev]->converter = kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
> + midi_devs[devc->my_dev]->converter = kmemdup(&std_midi_synth,
> + sizeof(struct synth_operations),
> + GFP_KERNEL);
> +
> if (!midi_devs[devc->my_dev]->converter) {
> printk(KERN_WARNING "uart401: Failed to allocate memory\n");
> goto cleanup_midi_devs;
> }
> - memcpy(midi_devs[devc->my_dev]->converter, &std_midi_synth, sizeof(struct synth_operations));
> strcpy(midi_devs[devc->my_dev]->info.name, name);
> midi_devs[devc->my_dev]->converter->id = "UART401";
> midi_devs[devc->my_dev]->converter->midi_dev = devc->my_dev;
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-02 9:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-25 13:46 [PATCH] sound: oss: uart401: Used kmemdup instead of kmalloc and memcpy Alexandru Gheorghiu
2013-04-02 9:23 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.