Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 550a8b69 authored by Julia Lawall's avatar Julia Lawall Committed by Takashi Iwai
Browse files

ALSA: sound/pci/asihpi: Use kzalloc 

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1be1d76b

sound/pci/asihpi/hpi6000.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

sound/pci/asihpi/hpi6205.c

+1 −2
Original line number Diff line number Diff line
@@ -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);