ALSA: sound/pci/asihpi: Use kzalloc
authorJulia Lawall <julia@diku.dk>
Thu, 13 May 2010 19:58:37 +0000 (21:58 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 17 May 2010 06:12:44 +0000 (08:12 +0200)
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/asihpi/hpi6000.c
sound/pci/asihpi/hpi6205.c

index 9c50931731a5ef11b00c4572d9289de48473d7f4..839ecb2e4b643d83f229a311763408d7b3b53bee 100644 (file)
@@ -448,14 +448,13 @@ static void subsys_create_adapter(struct hpi_message *phm,
        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;
index 8df2ff76d9449180407394fde37b05db89009899..5e88c1fc2b9e4307b210d67a713769789a69b5c4 100644 (file)
@@ -482,13 +482,12 @@ static void subsys_create_adapter(struct hpi_message *phm,
        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);