Skip to content

Commit

Permalink
[ALSA] Replace with kzalloc() - pci stuff
Browse files Browse the repository at this point in the history
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: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
tiwai authored and Jaroslav Kysela committed Sep 12, 2005
1 parent 9e76a76 commit e560d8d
Show file tree
Hide file tree
Showing 46 changed files with 76 additions and 76 deletions.
4 changes: 2 additions & 2 deletions sound/pci/ac97/ac97_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/ac97/ak4531_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sound/pci/ad1889.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/atiixp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/atiixp_modem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/au88x0/au88x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ snd_vortex_create(snd_card_t * card, struct pci_dev *pci, vortex_t ** rchip)
}
pci_set_dma_mask(pci, VORTEX_DMA_MASK);

chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL)
return -ENOMEM;

Expand Down
2 changes: 1 addition & 1 deletion sound/pci/azt3328.c
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,7 @@ static int __devinit snd_azf3328_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;
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/bt87x.c
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ static int __devinit snd_bt87x_create(snd_card_t *card,
if (err < 0)
return err;

chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (!chip) {
pci_disable_device(pci);
return -ENOMEM;
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/ca0106/ca0106_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ static int snd_ca0106_pcm_open_playback_channel(snd_pcm_substream_t *substream,
snd_pcm_runtime_t *runtime = substream->runtime;
int err;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);

if (epcm == NULL)
return -ENOMEM;
Expand Down Expand Up @@ -419,7 +419,7 @@ static int snd_ca0106_pcm_open_capture_channel(snd_pcm_substream_t *substream, i
snd_pcm_runtime_t *runtime = substream->runtime;
int err;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
if (epcm == NULL) {
snd_printk("open_capture_channel: failed epcm alloc\n");
return -ENOMEM;
Expand Down Expand Up @@ -1144,7 +1144,7 @@ static int __devinit snd_ca0106_create(snd_card_t *card,
return -ENXIO;
}

chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) {
pci_disable_device(pci);
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/cmipci.c
Original file line number Diff line number Diff line change
Expand Up @@ -2775,7 +2775,7 @@ static int __devinit snd_cmipci_create(snd_card_t *card, struct pci_dev *pci,
if ((err = pci_enable_device(pci)) < 0)
return err;

cm = kcalloc(1, sizeof(*cm), GFP_KERNEL);
cm = kzalloc(sizeof(*cm), GFP_KERNEL);
if (cm == NULL) {
pci_disable_device(pci);
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/cs4281.c
Original file line number Diff line number Diff line change
Expand Up @@ -1383,7 +1383,7 @@ static int __devinit snd_cs4281_create(snd_card_t * card,
*rchip = NULL;
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;
Expand Down
4 changes: 2 additions & 2 deletions sound/pci/cs46xx/cs46xx_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@ static int _cs46xx_playback_open_channel (snd_pcm_substream_t * substream,int pc
cs46xx_pcm_t * cpcm;
snd_pcm_runtime_t *runtime = substream->runtime;

cpcm = kcalloc(1, sizeof(*cpcm), GFP_KERNEL);
cpcm = kzalloc(sizeof(*cpcm), GFP_KERNEL);
if (cpcm == NULL)
return -ENOMEM;
if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
Expand Down Expand Up @@ -3774,7 +3774,7 @@ int __devinit snd_cs46xx_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;
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/emu10k1/emu10k1_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ int __devinit snd_emu10k1_create(snd_card_t * card,
if ((err = pci_enable_device(pci)) < 0)
return err;

emu = kcalloc(1, sizeof(*emu), GFP_KERNEL);
emu = kzalloc(sizeof(*emu), GFP_KERNEL);
if (emu == NULL) {
pci_disable_device(pci);
return -ENOMEM;
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/emu10k1/emu10k1x.c
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ static int snd_emu10k1x_playback_open(snd_pcm_substream_t *substream)
if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
return err;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = chip;
Expand Down Expand Up @@ -571,7 +571,7 @@ static int snd_emu10k1x_pcm_open_capture(snd_pcm_substream_t *substream)
if ((err = snd_pcm_hw_constraint_step(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64)) < 0)
return err;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
if (epcm == NULL)
return -ENOMEM;

Expand Down Expand Up @@ -920,7 +920,7 @@ static int __devinit snd_emu10k1x_create(snd_card_t *card,
return -ENXIO;
}

chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) {
pci_disable_device(pci);
return -ENOMEM;
Expand Down
8 changes: 4 additions & 4 deletions sound/pci/emu10k1/emufx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@ static int __devinit _snd_emu10k1_audigy_init_efx(emu10k1_t *emu)
spin_lock_init(&emu->fx8010.irq_lock);
INIT_LIST_HEAD(&emu->fx8010.gpr_ctl);

if ((icode = kcalloc(1, sizeof(*icode), GFP_KERNEL)) == NULL ||
if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL ||
(icode->gpr_map = (u_int32_t __user *)kcalloc(512 + 256 + 256 + 2 * 1024, sizeof(u_int32_t), GFP_KERNEL)) == NULL ||
(controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(*controls), GFP_KERNEL)) == NULL) {
err = -ENOMEM;
Expand Down Expand Up @@ -1503,11 +1503,11 @@ static int __devinit _snd_emu10k1_init_efx(emu10k1_t *emu)
spin_lock_init(&emu->fx8010.irq_lock);
INIT_LIST_HEAD(&emu->fx8010.gpr_ctl);

if ((icode = kcalloc(1, sizeof(*icode), GFP_KERNEL)) == NULL)
if ((icode = kzalloc(sizeof(*icode), GFP_KERNEL)) == NULL)
return -ENOMEM;
if ((icode->gpr_map = (u_int32_t __user *)kcalloc(256 + 160 + 160 + 2 * 512, sizeof(u_int32_t), GFP_KERNEL)) == NULL ||
(controls = kcalloc(SND_EMU10K1_GPR_CONTROLS, sizeof(emu10k1_fx8010_control_gpr_t), GFP_KERNEL)) == NULL ||
(ipcm = kcalloc(1, sizeof(*ipcm), GFP_KERNEL)) == NULL) {
(ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL)) == NULL) {
err = -ENOMEM;
goto __err;
}
Expand Down Expand Up @@ -2217,7 +2217,7 @@ static int snd_emu10k1_fx8010_ioctl(snd_hwdep_t * hw, struct file *file, unsigne
kfree(ipcm);
return res;
case SNDRV_EMU10K1_IOCTL_PCM_PEEK:
ipcm = kcalloc(1, sizeof(*ipcm), GFP_KERNEL);
ipcm = kzalloc(sizeof(*ipcm), GFP_KERNEL);
if (ipcm == NULL)
return -ENOMEM;
if (copy_from_user(ipcm, argp, sizeof(*ipcm))) {
Expand Down
10 changes: 5 additions & 5 deletions sound/pci/emu10k1/emupcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ static int snd_emu10k1_efx_playback_open(snd_pcm_substream_t * substream)
snd_pcm_runtime_t *runtime = substream->runtime;
int i;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = emu;
Expand Down Expand Up @@ -1049,7 +1049,7 @@ static int snd_emu10k1_playback_open(snd_pcm_substream_t * substream)
snd_pcm_runtime_t *runtime = substream->runtime;
int i, err;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = emu;
Expand Down Expand Up @@ -1094,7 +1094,7 @@ static int snd_emu10k1_capture_open(snd_pcm_substream_t * substream)
snd_pcm_runtime_t *runtime = substream->runtime;
emu10k1_pcm_t *epcm;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = emu;
Expand Down Expand Up @@ -1130,7 +1130,7 @@ static int snd_emu10k1_capture_mic_open(snd_pcm_substream_t * substream)
emu10k1_pcm_t *epcm;
snd_pcm_runtime_t *runtime = substream->runtime;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = emu;
Expand Down Expand Up @@ -1170,7 +1170,7 @@ static int snd_emu10k1_capture_efx_open(snd_pcm_substream_t * substream)
int nefx = emu->audigy ? 64 : 32;
int idx;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
if (epcm == NULL)
return -ENOMEM;
epcm->emu = emu;
Expand Down
4 changes: 2 additions & 2 deletions sound/pci/emu10k1/p16v.c
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ static int snd_p16v_pcm_open_playback_channel(snd_pcm_substream_t *substream, in
snd_pcm_runtime_t *runtime = substream->runtime;
int err;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
//snd_printk("epcm kcalloc: %p\n", epcm);

if (epcm == NULL)
Expand Down Expand Up @@ -214,7 +214,7 @@ static int snd_p16v_pcm_open_capture_channel(snd_pcm_substream_t *substream, int
snd_pcm_runtime_t *runtime = substream->runtime;
int err;

epcm = kcalloc(1, sizeof(*epcm), GFP_KERNEL);
epcm = kzalloc(sizeof(*epcm), GFP_KERNEL);
//snd_printk("epcm kcalloc: %p\n", epcm);

if (epcm == NULL)
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/ens1370.c
Original file line number Diff line number Diff line change
Expand Up @@ -1943,7 +1943,7 @@ static int __devinit snd_ensoniq_create(snd_card_t * card,
*rensoniq = NULL;
if ((err = pci_enable_device(pci)) < 0)
return err;
ensoniq = kcalloc(1, sizeof(*ensoniq), GFP_KERNEL);
ensoniq = kzalloc(sizeof(*ensoniq), GFP_KERNEL);
if (ensoniq == NULL) {
pci_disable_device(pci);
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/es1938.c
Original file line number Diff line number Diff line change
Expand Up @@ -1494,7 +1494,7 @@ static int __devinit snd_es1938_create(snd_card_t * card,
return -ENXIO;
}

chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (chip == NULL) {
pci_disable_device(pci);
return -ENOMEM;
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/es1968.c
Original file line number Diff line number Diff line change
Expand Up @@ -1577,7 +1577,7 @@ static int snd_es1968_playback_open(snd_pcm_substream_t *substream)
if (apu1 < 0)
return apu1;

es = kcalloc(1, sizeof(*es), GFP_KERNEL);
es = kzalloc(sizeof(*es), GFP_KERNEL);
if (!es) {
snd_es1968_free_apu_pair(chip, apu1);
return -ENOMEM;
Expand Down Expand Up @@ -1622,7 +1622,7 @@ static int snd_es1968_capture_open(snd_pcm_substream_t *substream)
return apu2;
}

es = kcalloc(1, sizeof(*es), GFP_KERNEL);
es = kzalloc(sizeof(*es), GFP_KERNEL);
if (!es) {
snd_es1968_free_apu_pair(chip, apu1);
snd_es1968_free_apu_pair(chip, apu2);
Expand Down Expand Up @@ -2569,7 +2569,7 @@ static int __devinit snd_es1968_create(snd_card_t * card,
return -ENXIO;
}

chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
chip = kzalloc(sizeof(*chip), GFP_KERNEL);
if (! chip) {
pci_disable_device(pci);
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/fm801.c
Original file line number Diff line number Diff line change
Expand Up @@ -1263,7 +1263,7 @@ static int __devinit snd_fm801_create(snd_card_t * card,
*rchip = NULL;
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;
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/hda/hda_codec.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ static int init_unsol_queue(struct hda_bus *bus)
{
struct hda_bus_unsolicited *unsol;

unsol = kcalloc(1, sizeof(*unsol), GFP_KERNEL);
unsol = kzalloc(sizeof(*unsol), GFP_KERNEL);
if (! unsol) {
snd_printk(KERN_ERR "hda_codec: can't allocate unsolicited queue\n");
return -ENOMEM;
Expand Down Expand Up @@ -358,7 +358,7 @@ int snd_hda_bus_new(snd_card_t *card, const struct hda_bus_template *temp,
if (busp)
*busp = NULL;

bus = kcalloc(1, sizeof(*bus), GFP_KERNEL);
bus = kzalloc(sizeof(*bus), GFP_KERNEL);
if (bus == NULL) {
snd_printk(KERN_ERR "can't allocate struct hda_bus\n");
return -ENOMEM;
Expand Down Expand Up @@ -493,7 +493,7 @@ int snd_hda_codec_new(struct hda_bus *bus, unsigned int codec_addr,
return -EBUSY;
}

codec = kcalloc(1, sizeof(*codec), GFP_KERNEL);
codec = kzalloc(sizeof(*codec), GFP_KERNEL);
if (codec == NULL) {
snd_printk(KERN_ERR "can't allocate struct hda_codec\n");
return -ENOMEM;
Expand Down
4 changes: 2 additions & 2 deletions sound/pci/hda/hda_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static int add_new_node(struct hda_codec *codec, struct hda_gspec *spec, hda_nid
struct hda_gnode *node;
int nconns;

node = kcalloc(1, sizeof(*node), GFP_KERNEL);
node = kzalloc(sizeof(*node), GFP_KERNEL);
if (node == NULL)
return -ENOMEM;
node->nid = nid;
Expand Down Expand Up @@ -886,7 +886,7 @@ int snd_hda_parse_generic_codec(struct hda_codec *codec)
return -ENODEV;
}

spec = kcalloc(1, sizeof(*spec), GFP_KERNEL);
spec = kzalloc(sizeof(*spec), GFP_KERNEL);
if (spec == NULL) {
printk(KERN_ERR "hda_generic: can't allocate spec\n");
return -ENOMEM;
Expand Down
2 changes: 1 addition & 1 deletion sound/pci/hda/hda_intel.c
Original file line number Diff line number Diff line change
Expand Up @@ -1402,7 +1402,7 @@ static int __devinit azx_create(snd_card_t *card, struct pci_dev *pci,
if ((err = pci_enable_device(pci)) < 0)
return err;

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

if (NULL == chip) {
snd_printk(KERN_ERR SFX "cannot allocate chip\n");
Expand Down
Loading

0 comments on commit e560d8d

Please sign in to comment.