Commit e58de7ba authored by Takashi Iwai's avatar Takashi Iwai Committed by Takashi Iwai
Browse files

ALSA: Convert to snd_card_create() in sound/pci/* 



Convert from snd_card_new() to the new snd_card_create() function
in sound/pci/*.

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

sound/pci/ad1889.c

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

sound/pci/ali5451/ali5451.c

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

sound/pci/als300.c

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

sound/pci/als4000.c

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

sound/pci/atiixp.c

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