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

Commit 4323cc4d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: isa: Convert to snd_card_new() with a device pointer 



Also remove superfluous snd_card_set_dev() calls.

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

sound/isa/ad1816a/ad1816a.c

+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,8 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard, 
	struct snd_opl3 *opl3;

	struct snd_timer *timer;



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

	error = snd_card_new(&pcard->card->dev,

			     index[dev], id[dev], THIS_MODULE,

			     sizeof(struct snd_ad1816a), &card);

	if (error < 0)

		return error;
@@ -154,7 +155,6 @@ static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard, 
		snd_card_free(card);

		return error;

	}

	snd_card_set_dev(card, &pcard->card->dev);



	if ((error = snd_ad1816a_create(card, port[dev],

					irq[dev],

sound/isa/ad1848/ad1848.c

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

	int error;



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

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

	if (error < 0)

		return error;
@@ -119,8 +119,6 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n) 
	if (thinkpad[n])

		strcat(card->longname, " [Thinkpad]");



	snd_card_set_dev(card, dev);



	error = snd_card_register(card);

	if (error < 0)

		goto out;

sound/isa/adlib.c

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

	int error;



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

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

	if (error < 0) {

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

		return error;
@@ -83,8 +83,6 @@ static int snd_adlib_probe(struct device *dev, unsigned int n) 
		goto out;

	}



	snd_card_set_dev(card, dev);



	error = snd_card_register(card);

	if (error < 0) {

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

sound/isa/als100.c

+3 −3
Original line number Diff line number Diff line
@@ -193,7 +193,8 @@ static int snd_card_als100_probe(int dev, 
	struct snd_card_als100 *acard;

	struct snd_opl3 *opl3;



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

	error = snd_card_new(&pcard->card->dev,

			     index[dev], id[dev], THIS_MODULE,

			     sizeof(struct snd_card_als100), &card);

	if (error < 0)

		return error;
@@ -203,7 +204,6 @@ static int snd_card_als100_probe(int dev, 
		snd_card_free(card);

		return error;

	}

	snd_card_set_dev(card, &pcard->card->dev);



	if (pid->driver_data == SB_HW_DT019X)

		dma16[dev] = -1;

sound/isa/azt2320.c

+3 −3
Original line number Diff line number Diff line
@@ -184,7 +184,8 @@ static int snd_card_azt2320_probe(int dev, 
	struct snd_wss *chip;

	struct snd_opl3 *opl3;



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

	error = snd_card_new(&pcard->card->dev,

			     index[dev], id[dev], THIS_MODULE,

			     sizeof(struct snd_card_azt2320), &card);

	if (error < 0)

		return error;
@@ -194,7 +195,6 @@ static int snd_card_azt2320_probe(int dev, 
		snd_card_free(card);

		return error;

	}

	snd_card_set_dev(card, &pcard->card->dev);



	if ((error = snd_card_azt2320_enable_wss(port[dev]))) {

		snd_card_free(card);