leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ALSA] Replace with kzalloc() - isa stuff

Browse Source 
ES18xx driver,OPL3SA2 driver,AD1816A driver,AD1848 driver,CS4231 driver
ES1688 driver,GUS Library,Opti9xx drivers,EMU8000 driver
SB16/AWE driver,SB drivers
Replace kcalloc(1,..) with kzalloc().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2005-09-09 14:21:17 +02:00 committed by Jaroslav Kysela
parent ecca82b4b4
commit 9e76a76efc
14 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/isa/ad1816a/ad1816a_lib.c
View File

@ -591,7 +591,7 @@ int snd_ad1816a_create(snd_card_t *card,
*rchip = NULL; *rchip = NULL;
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
chip->irq = -1; chip->irq = -1;

2
sound/isa/ad1848/ad1848_lib.c
View File

@ -890,7 +890,7 @@ int snd_ad1848_create(snd_card_t * card,
int err; int err;
*rchip = NULL; *rchip = NULL;
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->reg_lock);

2
sound/isa/cs423x/cs4231_lib.c
View File

@ -1480,7 +1480,7 @@ static int snd_cs4231_new(snd_card_t * card,
cs4231_t *chip; cs4231_t *chip;
*rchip = NULL; *rchip = NULL;
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
chip->hardware = hardware; chip->hardware = hardware;

2
sound/isa/es1688/es1688_lib.c
View File

@ -649,7 +649,7 @@ int snd_es1688_create(snd_card_t * card,
int err; int err;
*rchip = NULL; *rchip = NULL;
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
chip->irq = -1; chip->irq = -1;

2
sound/isa/es18xx.c
View File

@ -1686,7 +1686,7 @@ static int __devinit snd_es18xx_new_device(snd_card_t * card,
int err; int err;
*rchip = NULL; *rchip = NULL;
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->reg_lock);

2
sound/isa/gus/gus_main.c
View File

@ -157,7 +157,7 @@ int snd_gus_create(snd_card_t * card,
}; };
*rgus = NULL; *rgus = NULL;
gus = kcalloc(1, sizeof(*gus), GFP_KERNEL); gus = kzalloc(sizeof(*gus), GFP_KERNEL);
if (gus == NULL) if (gus == NULL)
return -ENOMEM; return -ENOMEM;
gus->gf1.irq = -1; gus->gf1.irq = -1;

4
sound/isa/gus/gus_mem_proc.c
View File

@ -98,7 +98,7 @@ int snd_gf1_mem_proc_init(snd_gus_card_t * gus)
for (idx = 0; idx < 4; idx++) { for (idx = 0; idx < 4; idx++) {
if (gus->gf1.mem_alloc.banks_8[idx].size > 0) { if (gus->gf1.mem_alloc.banks_8[idx].size > 0) {
priv = kcalloc(1, sizeof(*priv), GFP_KERNEL); priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (priv == NULL) if (priv == NULL)
return -ENOMEM; return -ENOMEM;
priv->gus = gus; priv->gus = gus;
@ -115,7 +115,7 @@ int snd_gf1_mem_proc_init(snd_gus_card_t * gus)
} }
for (idx = 0; idx < 4; idx++) { for (idx = 0; idx < 4; idx++) {
if (gus->gf1.rom_present & (1 << idx)) { if (gus->gf1.rom_present & (1 << idx)) {
priv = kcalloc(1, sizeof(*priv), GFP_KERNEL); priv = kzalloc(sizeof(*priv), GFP_KERNEL);
if (priv == NULL) if (priv == NULL)
return -ENOMEM; return -ENOMEM;
priv->rom = 1; priv->rom = 1;

2
sound/isa/gus/gus_pcm.c
View File

@ -666,7 +666,7 @@ static int snd_gf1_pcm_playback_open(snd_pcm_substream_t *substream)
snd_pcm_runtime_t *runtime = substream->runtime; snd_pcm_runtime_t *runtime = substream->runtime;
int err; int err;
pcmp = kcalloc(1, sizeof(*pcmp), GFP_KERNEL); pcmp = kzalloc(sizeof(*pcmp), GFP_KERNEL);
if (pcmp == NULL) if (pcmp == NULL)
return -ENOMEM; return -ENOMEM;
pcmp->gus = gus; pcmp->gus = gus;

2
sound/isa/opl3sa2.c
View File

@ -715,7 +715,7 @@ static int __devinit snd_opl3sa2_probe(int dev,
return -ENOMEM; return -ENOMEM;
strcpy(card->driver, "OPL3SA2"); strcpy(card->driver, "OPL3SA2");
strcpy(card->shortname, "Yamaha OPL3-SA2"); strcpy(card->shortname, "Yamaha OPL3-SA2");
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) { if (chip == NULL) {
err = -ENOMEM; err = -ENOMEM;
goto __error; goto __error;

2
sound/isa/opti9xx/opti92x-ad1848.c
View File

@ -1273,7 +1273,7 @@ static int snd_opti93x_create(snd_card_t *card, opti9xx_t *chip,
opti93x_t *codec; opti93x_t *codec;
*rcodec = NULL; *rcodec = NULL;
codec = kcalloc(1, sizeof(*codec), GFP_KERNEL); codec = kzalloc(sizeof(*codec), GFP_KERNEL);
if (codec == NULL) if (codec == NULL)
return -ENOMEM; return -ENOMEM;
codec->irq = -1; codec->irq = -1;

2
sound/isa/sb/emu8000.c
View File

@ -1097,7 +1097,7 @@ snd_emu8000_new(snd_card_t *card, int index, long port, int seq_ports, snd_seq_d
if (seq_ports <= 0) if (seq_ports <= 0)
return 0; return 0;
hw = kcalloc(1, sizeof(*hw), GFP_KERNEL); hw = kzalloc(sizeof(*hw), GFP_KERNEL);
if (hw == NULL) if (hw == NULL)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&hw->reg_lock); spin_lock_init(&hw->reg_lock);

2
sound/isa/sb/emu8000_pcm.c
View File

@ -233,7 +233,7 @@ static int emu8k_pcm_open(snd_pcm_substream_t *subs)
emu8k_pcm_t *rec; emu8k_pcm_t *rec;
snd_pcm_runtime_t *runtime = subs->runtime; snd_pcm_runtime_t *runtime = subs->runtime;
rec = kcalloc(1, sizeof(*rec), GFP_KERNEL); rec = kzalloc(sizeof(*rec), GFP_KERNEL);
if (! rec) if (! rec)
return -ENOMEM; return -ENOMEM;

2
sound/isa/sb/sb16_csp.c
View File

@ -122,7 +122,7 @@ int snd_sb_csp_new(sb_t *chip, int device, snd_hwdep_t ** rhwdep)
if ((err = snd_hwdep_new(chip->card, "SB16-CSP", device, &hw)) < 0) if ((err = snd_hwdep_new(chip->card, "SB16-CSP", device, &hw)) < 0)
return err; return err;
if ((p = kcalloc(1, sizeof(*p), GFP_KERNEL)) == NULL) { if ((p = kzalloc(sizeof(*p), GFP_KERNEL)) == NULL) {
snd_device_free(chip->card, hw); snd_device_free(chip->card, hw);
return -ENOMEM; return -ENOMEM;
} }

2
sound/isa/sb/sb_common.c
View File

@ -221,7 +221,7 @@ int snd_sbdsp_create(snd_card_t *card,
snd_assert(r_chip != NULL, return -EINVAL); snd_assert(r_chip != NULL, return -EINVAL);
*r_chip = NULL; *r_chip = NULL;
chip = kcalloc(1, sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) if (chip == NULL)
return -ENOMEM; return -ENOMEM;
spin_lock_init(&chip->reg_lock); spin_lock_init(&chip->reg_lock);