diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 14:41:09 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-02-14 08:14:07 +0100 |
| commit | a2fefc35a99f684b4ba15d243995170fa23bdd7e (patch) | |
| tree | a9d3cf0de672a70b06f49e9f99b43988508972f0 | |
| parent | e7182ac5a3de8836a7b03655a5b8d6b71873fcbc (diff) | |
| download | op-kernel-dev-a2fefc35a99f684b4ba15d243995170fa23bdd7e.zip op-kernel-dev-a2fefc35a99f684b4ba15d243995170fa23bdd7e.tar.gz | |
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>
| -rw-r--r-- | sound/sparc/amd7930.c | 4 | ||||
| -rw-r--r-- | sound/sparc/cs4231.c | 11 | ||||
| -rw-r--r-- | sound/sparc/dbri.c | 4 |
3 files changed, 10 insertions, 9 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index 174d21f..4a85e14 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c @@ -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; diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index dbb1b625..4e91bca 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -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; diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index eee7afc..be1b1aa 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -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; |
