hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2014-01-29 14:41:09 +01:00
parent e7182ac5a3
commit a2fefc35a9
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/sparc/amd7930.c
View File

@ -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;

11
sound/sparc/cs4231.c
View File

@ -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,8 +1582,8 @@ static int cs4231_attach_begin(struct snd_card **rcard)
return -ENOENT;
}
err = snd_card_create(index[dev], id[dev], THIS_MODULE,
sizeof(struct snd_cs4231), &card);
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;

4
sound/sparc/dbri.c
View File

@ -2615,8 +2615,8 @@ static int dbri_probe(struct platform_device *op)
return -ENODEV;
}
err = snd_card_create(index[dev], id[dev], THIS_MODULE,
sizeof(struct snd_dbri), &card);
err = snd_card_new(&op->dev, index[dev], id[dev], THIS_MODULE,
sizeof(struct snd_dbri), &card);
if (err < 0)
return err;