Skip to content

Commit

Permalink
ALSA: Convert to snd_card_create() in sound/pci/*
Browse files Browse the repository at this point in the history 
Convert from snd_card_new() to the new snd_card_create() function
in sound/pci/*.

Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
@tiwai
Takashi Iwai authored and tiwai committed Jan 12, 2009
1 parent c95eadd commit e58de7b
Show file tree
Hide file tree
Showing 47 changed files with 148 additions and 144 deletions.
6 changes: 3 additions & 3 deletions sound/pci/ad1889.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -995,10 +995,10 @@ snd_ad1889_probe(struct pci_dev *pci,
}

/* (2) */
card = snd_card_new(index[devno], id[devno], THIS_MODULE, 0);
err = snd_card_create(index[devno], id[devno], THIS_MODULE, 0, &card);
/* XXX REVISIT: we can probably allocate chip in this call */
if (card == NULL)
return -ENOMEM;
if (err < 0)
return err;

strcpy(card->driver, "AD1889");
strcpy(card->shortname, "Analog Devices AD1889");
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/ali5451/ali5451.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2307,9 +2307,9 @@ static int __devinit snd_ali_probe(struct pci_dev *pci,

snd_ali_printk("probe ...\n");

card = snd_card_new(index, id, THIS_MODULE, 0);
if (!card)
return -ENOMEM;
err = snd_card_create(index, id, THIS_MODULE, 0, &card);
if (err < 0)
return err;

err = snd_ali_create(card, pci, pcm_channels, spdif, &codec);
if (err < 0)
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/als300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -812,10 +812,10 @@ static int __devinit snd_als300_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);

if (card == NULL)
return -ENOMEM;
if (err < 0)
return err;

chip_type = pci_id->driver_data;

Expand Down
9 changes: 5 additions & 4 deletions sound/pci/als4000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -889,12 +889,13 @@ static int __devinit snd_card_als4000_probe(struct pci_dev *pci,
pci_write_config_word(pci, PCI_COMMAND, word | PCI_COMMAND_IO);
pci_set_master(pci);

card = snd_card_new(index[dev], id[dev], THIS_MODULE,
sizeof(*acard) /* private_data: acard */);
if (card == NULL) {
err = snd_card_create(index[dev], id[dev], THIS_MODULE,
sizeof(*acard) /* private_data: acard */,
&card);
if (err < 0) {
pci_release_regions(pci);
pci_disable_device(pci);
return -ENOMEM;
return err;
}

acard = card->private_data;
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/atiixp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1645,9 +1645,9 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,
struct atiixp *chip;
int err;

card = snd_card_new(index, id, THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index, id, THIS_MODULE, 0, &card);
if (err < 0)
return err;

strcpy(card->driver, spdif_aclink ? "ATIIXP" : "ATIIXP-SPDMA");
strcpy(card->shortname, "ATI IXP");
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/atiixp_modem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1288,9 +1288,9 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci,
struct atiixp_modem *chip;
int err;

card = snd_card_new(index, id, THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index, id, THIS_MODULE, 0, &card);
if (err < 0)
return err;

strcpy(card->driver, "ATIIXP-MODEM");
strcpy(card->shortname, "ATI IXP Modem");
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/au88x0/au88x0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,9 @@ snd_vortex_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
return -ENOENT;
}
// (2)
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

// (3)
if ((err = snd_vortex_create(card, pci, &chip)) < 0) {
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/aw2/aw2-alsa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,9 @@ static int __devinit snd_aw2_probe(struct pci_dev *pci,
}

/* (2) Create card instance */
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

/* (3) Create main component */
err = snd_aw2_create(card, pci, &chip);
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/azt3328.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2216,9 +2216,9 @@ snd_azf3328_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

strcpy(card->driver, "AZF3328");
strcpy(card->shortname, "Aztech AZF3328 (PCI168)");
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/bt87x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -888,9 +888,9 @@ static int __devinit snd_bt87x_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (!card)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

err = snd_bt87x_create(card, pci, &chip);
if (err < 0)
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/ca0106/ca0106_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1707,9 +1707,9 @@ static int __devinit snd_ca0106_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

err = snd_ca0106_create(dev, card, pci, &chip);
if (err < 0)
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/cmipci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3272,9 +3272,9 @@ static int __devinit snd_cmipci_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

switch (pci->device) {
case PCI_DEVICE_ID_CMEDIA_CM8738:
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/cs4281.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1925,9 +1925,9 @@ static int __devinit snd_cs4281_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

if ((err = snd_cs4281_create(card, pci, &chip, dual_codec[dev])) < 0) {
snd_card_free(card);
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/cs46xx/cs46xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ static int __devinit snd_card_cs46xx_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;
if ((err = snd_cs46xx_create(card, pci,
external_amp[dev], thinkpad[dev],
&chip)) < 0) {
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/cs5530.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,10 @@ static int __devinit snd_cs5530_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);

if (card == NULL)
return -ENOMEM;
if (err < 0)
return err;

err = snd_cs5530_create(card, pci, &chip);
if (err < 0) {
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/cs5535audio/cs5535audio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,9 @@ static int __devinit snd_cs5535audio_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

if ((err = snd_cs5535audio_create(card, pci, &cs5535au)) < 0)
goto probefail_out;
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/echoaudio/echoaudio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1997,9 +1997,9 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,

DE_INIT(("Echoaudio driver starting...\n"));
i = 0;
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

snd_card_set_dev(card, &pci->dev);

Expand Down
6 changes: 3 additions & 3 deletions sound/pci/emu10k1/emu10k1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,9 @@ static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;
if (max_buffer_size[dev] < 32)
max_buffer_size[dev] = 32;
else if (max_buffer_size[dev] > 1024)
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/emu10k1/emu10k1x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1544,9 +1544,9 @@ static int __devinit snd_emu10k1x_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

if ((err = snd_emu10k1x_create(card, pci, &chip)) < 0) {
snd_card_free(card);
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/ens1370.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2409,9 +2409,9 @@ static int __devinit snd_audiopci_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

if ((err = snd_ensoniq_create(card, pci, &ensoniq)) < 0) {
snd_card_free(card);
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/es1938.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1799,9 +1799,9 @@ static int __devinit snd_es1938_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;
for (idx = 0; idx < 5; idx++) {
if (pci_resource_start(pci, idx) == 0 ||
!(pci_resource_flags(pci, idx) & IORESOURCE_IO)) {
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/es1968.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2645,9 +2645,9 @@ static int __devinit snd_es1968_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (!card)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

if (total_bufsize[dev] < 128)
total_bufsize[dev] = 128;
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/fm801.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1468,9 +1468,9 @@ static int __devinit snd_card_fm801_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;
if ((err = snd_fm801_create(card, pci, tea575x_tuner[dev], &chip)) < 0) {
snd_card_free(card);
return err;
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/hda/hda_intel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2335,10 +2335,10 @@ static int __devinit azx_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (!card) {
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0) {
snd_printk(KERN_ERR SFX "Error creating card!\n");
return -ENOMEM;
return err;
}

err = azx_create(card, pci, dev, pci_id->driver_data, &chip);
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/ice1712/ice1712.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2648,9 +2648,9 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

strcpy(card->driver, "ICE1712");
strcpy(card->shortname, "ICEnsemble ICE1712");
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/ice1712/ice1724.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2456,9 +2456,9 @@ static int __devinit snd_vt1724_probe(struct pci_dev *pci,
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

strcpy(card->driver, "ICE1724");
strcpy(card->shortname, "ICEnsemble ICE1724");
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/intel8x0.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3058,9 +3058,9 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci,
int err;
struct shortname_table *name;

card = snd_card_new(index, id, THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index, id, THIS_MODULE, 0, &card);
if (err < 0)
return err;

if (spdif_aclink < 0)
spdif_aclink = check_default_spdif_aclink(pci);
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/intel8x0m.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1269,9 +1269,9 @@ static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
int err;
struct shortname_table *name;

card = snd_card_new(index, id, THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index, id, THIS_MODULE, 0, &card);
if (err < 0)
return err;

strcpy(card->driver, "ICH-MODEM");
strcpy(card->shortname, "Intel ICH");
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/korg1212/korg1212.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2443,9 +2443,9 @@ snd_korg1212_probe(struct pci_dev *pci,
dev++;
return -ENOENT;
}
card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

if ((err = snd_korg1212_create(card, pci, &korg1212)) < 0) {
snd_card_free(card);
Expand Down
6 changes: 3 additions & 3 deletions sound/pci/maestro3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2691,9 +2691,9 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id)
return -ENOENT;
}

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
if (card == NULL)
return -ENOMEM;
err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
if (err < 0)
return err;

switch (pci->device) {
case PCI_DEVICE_ID_ESS_ALLEGRO:
Expand Down
Loading

0 comments on commit e58de7b

Please sign in to comment.