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

Commit a2fefc35 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: sparc: 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 e7182ac5

sound/sparc/amd7930.c

+2 −2
Original line number Diff line number Diff line
@@ -1019,8 +1019,8 @@ static int amd7930_sbus_probe(struct platform_device *op) 
		return -ENOENT;

	}



	err = snd_card_create(index[dev_num], id[dev_num], THIS_MODULE, 0,

			      &card);

	err = snd_card_new(&op->dev, index[dev_num], id[dev_num],

			   THIS_MODULE, 0, &card);

	if (err < 0)

		return err;

sound/sparc/cs4231.c

+6 −5
Original line number Diff line number Diff line
@@ -1565,7 +1565,8 @@ static int snd_cs4231_mixer(struct snd_card *card) 


static int dev;



static int cs4231_attach_begin(struct snd_card **rcard)

static int cs4231_attach_begin(struct platform_device *op,

			       struct snd_card **rcard)

{

	struct snd_card *card;

	struct snd_cs4231 *chip;
@@ -1581,7 +1582,7 @@ static int cs4231_attach_begin(struct snd_card **rcard) 
		return -ENOENT;

	}



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

	err = snd_card_new(&op->dev, index[dev], id[dev], THIS_MODULE,

			   sizeof(struct snd_cs4231), &card);

	if (err < 0)

		return err;
@@ -1869,7 +1870,7 @@ static int cs4231_sbus_probe(struct platform_device *op) 
	struct snd_card *card;

	int err;



	err = cs4231_attach_begin(&card);

	err = cs4231_attach_begin(op, &card);

	if (err)

		return err;
@@ -2060,7 +2061,7 @@ static int cs4231_ebus_probe(struct platform_device *op) 
	struct snd_card *card;

	int err;



	err = cs4231_attach_begin(&card);

	err = cs4231_attach_begin(op, &card);

	if (err)

		return err;

sound/sparc/dbri.c

+2 −2
Original line number Diff line number Diff line
@@ -2615,7 +2615,7 @@ static int dbri_probe(struct platform_device *op) 
		return -ENODEV;

	}



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

	err = snd_card_new(&op->dev, index[dev], id[dev], THIS_MODULE,

			   sizeof(struct snd_dbri), &card);

	if (err < 0)

		return err;