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

Commit e560d8d8 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Replace with kzalloc() - pci stuff 



AD1889 driver,ATIIXP driver,ATIIXP-modem driver,AZT3328 driver
BT87x driver,CMIPCI driver,CS4281 driver,ENS1370/1+ driver
ES1938 driver,ES1968 driver,FM801 driver,Intel8x0 driver
Intel8x0-modem driver,Maestro3 driver,SonicVibes driver,VIA82xx driver
VIA82xx-modem driver,AC97 Codec,AK4531 codec,au88x0 driver
CA0106 driver,CS46xx driver,EMU10K1/EMU10K2 driver,HDA Codec driver
HDA generic driver,HDA Intel driver,ICE1712 driver,ICE1724 driver
KORG1212 driver,MIXART driver,NM256 driver,Trident driver,YMFPCI driver
Replace kcalloc(1,..) with kzalloc().

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9e76a76e

sound/pci/ac97/ac97_codec.c

+2 −2
Original line number Diff line number Diff line
@@ -1797,7 +1797,7 @@ int snd_ac97_bus(snd_card_t *card, int num, ac97_bus_ops_t *ops, 


	snd_assert(card != NULL, return -EINVAL);

	snd_assert(rbus != NULL, return -EINVAL);

	bus = kcalloc(1, sizeof(*bus), GFP_KERNEL);

	bus = kzalloc(sizeof(*bus), GFP_KERNEL);

	if (bus == NULL)

		return -ENOMEM;

	bus->card = card;
@@ -1906,7 +1906,7 @@ int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97) 
	}



	card = bus->card;

	ac97 = kcalloc(1, sizeof(*ac97), GFP_KERNEL);

	ac97 = kzalloc(sizeof(*ac97), GFP_KERNEL);

	if (ac97 == NULL)

		return -ENOMEM;

	ac97->private_data = template->private_data;

sound/pci/ac97/ak4531_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ int snd_ak4531_mixer(snd_card_t * card, ak4531_t * _ak4531, ak4531_t ** rak4531) 
	snd_assert(rak4531 != NULL, return -EINVAL);

	*rak4531 = NULL;

	snd_assert(card != NULL && _ak4531 != NULL, return -EINVAL);

	ak4531 = kcalloc(1, sizeof(*ak4531), GFP_KERNEL);

	ak4531 = kzalloc(sizeof(*ak4531), GFP_KERNEL);

	if (ak4531 == NULL)

		return -ENOMEM;

	*ak4531 = *_ak4531;

sound/pci/ad1889.c

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
#include "ad1889.h"

#include "ac97/ac97_id.h"



#define	AD1889_DRVVER	"$Revision: 1.1 $"

#define	AD1889_DRVVER	"$Revision: 1.2 $"



MODULE_AUTHOR("Kyle McMartin <kyle@parisc-linux.org>, Thibaut Varene <t-bone@parisc-linux.org>");

MODULE_DESCRIPTION("Analog Devices AD1889 ALSA sound driver");
@@ -928,7 +928,7 @@ snd_ad1889_create(snd_card_t *card, 
	}



	/* allocate chip specific data with zero-filled memory */

	if ((chip = kcalloc(1, sizeof(*chip), GFP_KERNEL)) == NULL) {

	if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) {

		pci_disable_device(pci);

		return -ENOMEM;

	}

sound/pci/atiixp.c

+1 −1
Original line number Diff line number Diff line
@@ -1531,7 +1531,7 @@ static int __devinit snd_atiixp_create(snd_card_t *card, 
	if ((err = pci_enable_device(pci)) < 0)

		return err;



	chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);

	chip = kzalloc(sizeof(*chip), GFP_KERNEL);

	if (chip == NULL) {

		pci_disable_device(pci);

		return -ENOMEM;

sound/pci/atiixp_modem.c

+1 −1
Original line number Diff line number Diff line
@@ -1208,7 +1208,7 @@ static int __devinit snd_atiixp_create(snd_card_t *card, 
	if ((err = pci_enable_device(pci)) < 0)

		return err;



	chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);

	chip = kzalloc(sizeof(*chip), GFP_KERNEL);

	if (chip == NULL) {

		pci_disable_device(pci);

		return -ENOMEM;