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

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

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



Convert from snd_card_new() to the new snd_card_create() function.

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

sound/isa/ad1816a/ad1816a.c

+4 −3
Original line number Diff line number Diff line
@@ -157,9 +157,10 @@ static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard 
	struct snd_ad1816a *chip;

	struct snd_opl3 *opl3;



	if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,

				 sizeof(struct snd_card_ad1816a))) == NULL)

		return -ENOMEM;

	error = snd_card_create(index[dev], id[dev], THIS_MODULE,

				sizeof(struct snd_card_ad1816a), &card);

	if (error < 0)

		return error;

	acard = (struct snd_card_ad1816a *)card->private_data;



	if ((error = snd_card_ad1816a_pnp(dev, acard, pcard, pid))) {

sound/isa/ad1848/ad1848.c

+3 −3
Original line number Diff line number Diff line
@@ -91,9 +91,9 @@ static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n) 
	struct snd_pcm *pcm;

	int error;



	card = snd_card_new(index[n], id[n], THIS_MODULE, 0);

	if (!card)

		return -EINVAL;

	error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);

	if (error < 0)

		return error;



	error = snd_wss_create(card, port[n], -1, irq[n], dma1[n], -1,

			thinkpad[n] ? WSS_HW_THINKPAD : WSS_HW_DETECT,

sound/isa/adlib.c

+3 −3
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ static int __devinit snd_adlib_probe(struct device *dev, unsigned int n) 
	struct snd_opl3 *opl3;

	int error;



	card = snd_card_new(index[n], id[n], THIS_MODULE, 0);

	if (!card) {

	error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);

	if (error < 0) {

		dev_err(dev, "could not create card\n");

		return -EINVAL;

		return error;

	}



	card->private_data = request_region(port[n], 4, CRD_NAME);

sound/isa/als100.c

+4 −3
Original line number Diff line number Diff line
@@ -163,9 +163,10 @@ static int __devinit snd_card_als100_probe(int dev, 
	struct snd_card_als100 *acard;

	struct snd_opl3 *opl3;



	if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,

				 sizeof(struct snd_card_als100))) == NULL)

		return -ENOMEM;

	error = snd_card_create(index[dev], id[dev], THIS_MODULE,

				sizeof(struct snd_card_als100), &card);

	if (error < 0)

		return error;

	acard = card->private_data;



	if ((error = snd_card_als100_pnp(dev, acard, pcard, pid))) {

sound/isa/azt2320.c

+4 −3
Original line number Diff line number Diff line
@@ -184,9 +184,10 @@ static int __devinit snd_card_azt2320_probe(int dev, 
	struct snd_wss *chip;

	struct snd_opl3 *opl3;



	if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,

				 sizeof(struct snd_card_azt2320))) == NULL)

		return -ENOMEM;

	error = snd_card_create(index[dev], id[dev], THIS_MODULE,

				sizeof(struct snd_card_azt2320), &card);

	if (error < 0)

		return error;

	acard = (struct snd_card_azt2320 *)card->private_data;



	if ((error = snd_card_azt2320_pnp(dev, acard, pcard, pid))) {