* [PATCH 1/20] sound/pci/asihpi: Use kzalloc
@ 2010-05-13 19:58 Julia Lawall
2010-05-17 6:15 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Julia Lawall @ 2010-05-13 19:58 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai, alsa-devel, linux-kernel,
kernel-janitors
From: Julia Lawall <julia@diku.dk>
Use kzalloc rather than the combination of kmalloc and memset.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression x,size,flags;
statement S;
@@
-x = kmalloc(size,flags);
+x = kzalloc(size,flags);
if (x == NULL) S
-memset(x, 0, size);
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
---
sound/pci/asihpi/hpi6000.c | 3 +--
sound/pci/asihpi/hpi6205.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff -u -p a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
--- a/sound/pci/asihpi/hpi6000.c
+++ b/sound/pci/asihpi/hpi6000.c
@@ -448,14 +448,13 @@ static void subsys_create_adapter(struct
if (phm->u.s.resource.r.pci->device_id != HPI_PCI_DEV_ID_PCI2040)
return;
- ao.priv = kmalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
+ ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
if (!ao.priv) {
HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n");
phr->error = HPI_ERROR_MEMORY_ALLOC;
return;
}
- memset(ao.priv, 0, sizeof(struct hpi_hw_obj));
/* create the adapter object based on the resource information */
/*? memcpy(&ao.Pci,&phm->u.s.Resource.r.Pci,sizeof(ao.Pci)); */
ao.pci = *phm->u.s.resource.r.pci;
diff -u -p a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
--- a/sound/pci/asihpi/hpi6205.c
+++ b/sound/pci/asihpi/hpi6205.c
@@ -482,13 +482,12 @@ static void subsys_create_adapter(struct
if (phm->u.s.resource.r.pci->device_id != HPI_PCI_DEV_ID_DSP6205)
return;
- ao.priv = kmalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
+ ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
if (!ao.priv) {
HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n");
phr->error = HPI_ERROR_MEMORY_ALLOC;
return;
}
- memset(ao.priv, 0, sizeof(struct hpi_hw_obj));
ao.pci = *phm->u.s.resource.r.pci;
err = create_adapter_obj(&ao, &os_error_code);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1/20] sound/pci/asihpi: Use kzalloc
2010-05-13 19:58 [PATCH 1/20] sound/pci/asihpi: Use kzalloc Julia Lawall
@ 2010-05-17 6:15 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2010-05-17 6:15 UTC (permalink / raw)
To: Julia Lawall; +Cc: alsa-devel, kernel-janitors, linux-kernel
At Thu, 13 May 2010 21:58:37 +0200 (CEST),
Julia Lawall wrote:
>
> From: Julia Lawall <julia@diku.dk>
>
> Use kzalloc rather than the combination of kmalloc and memset.
>
> The semantic patch that makes this change is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression x,size,flags;
> statement S;
> @@
>
> -x = kmalloc(size,flags);
> +x = kzalloc(size,flags);
> if (x == NULL) S
> -memset(x, 0, size);
> // </smpl>
>
> Signed-off-by: Julia Lawall <julia@diku.dk>
Applied now. Thanks.
Takashi
> ---
> sound/pci/asihpi/hpi6000.c | 3 +--
> sound/pci/asihpi/hpi6205.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff -u -p a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c
> --- a/sound/pci/asihpi/hpi6000.c
> +++ b/sound/pci/asihpi/hpi6000.c
> @@ -448,14 +448,13 @@ static void subsys_create_adapter(struct
> if (phm->u.s.resource.r.pci->device_id != HPI_PCI_DEV_ID_PCI2040)
> return;
>
> - ao.priv = kmalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
> + ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
> if (!ao.priv) {
> HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n");
> phr->error = HPI_ERROR_MEMORY_ALLOC;
> return;
> }
>
> - memset(ao.priv, 0, sizeof(struct hpi_hw_obj));
> /* create the adapter object based on the resource information */
> /*? memcpy(&ao.Pci,&phm->u.s.Resource.r.Pci,sizeof(ao.Pci)); */
> ao.pci = *phm->u.s.resource.r.pci;
> diff -u -p a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c
> --- a/sound/pci/asihpi/hpi6205.c
> +++ b/sound/pci/asihpi/hpi6205.c
> @@ -482,13 +482,12 @@ static void subsys_create_adapter(struct
> if (phm->u.s.resource.r.pci->device_id != HPI_PCI_DEV_ID_DSP6205)
> return;
>
> - ao.priv = kmalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
> + ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL);
> if (!ao.priv) {
> HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n");
> phr->error = HPI_ERROR_MEMORY_ALLOC;
> return;
> }
> - memset(ao.priv, 0, sizeof(struct hpi_hw_obj));
>
> ao.pci = *phm->u.s.resource.r.pci;
> err = create_adapter_obj(&ao, &os_error_code);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-17 6:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-13 19:58 [PATCH 1/20] sound/pci/asihpi: Use kzalloc Julia Lawall
2010-05-17 6:15 ` Takashi Iwai
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).