diff options
author | Takashi Iwai <tiwai@alsa3.local> | 2008-12-28 10:45:02 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-12 09:21:19 -0500 |
commit | bd7dd77c2a05c530684eea2e3af16449ae9c5d52 (patch) | |
tree | f26e8b6c83ed58d3c2d47f9df6373812db80a885 /sound/sparc | |
parent | e58de7baf7de11f01a675cbbf6ecc8a2758b9ca5 (diff) |
ALSA: Convert to snd_card_create() in other sound/*
Convert from snd_card_new() to the new snd_card_create() function
in other sound subdirectories.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/sparc')
-rw-r--r-- | sound/sparc/amd7930.c | 7 | ||||
-rw-r--r-- | sound/sparc/cs4231.c | 9 | ||||
-rw-r--r-- | sound/sparc/dbri.c | 8 |
3 files changed, 13 insertions, 11 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index f87933e48812..ba38912614b4 100644 --- a/sound/sparc/amd7930.c +++ b/sound/sparc/amd7930.c | |||
@@ -1018,9 +1018,10 @@ static int __devinit amd7930_sbus_probe(struct of_device *op, const struct of_de | |||
1018 | return -ENOENT; | 1018 | return -ENOENT; |
1019 | } | 1019 | } |
1020 | 1020 | ||
1021 | card = snd_card_new(index[dev_num], id[dev_num], THIS_MODULE, 0); | 1021 | err = snd_card_create(index[dev_num], id[dev_num], THIS_MODULE, 0, |
1022 | if (card == NULL) | 1022 | &card); |
1023 | return -ENOMEM; | 1023 | if (err < 0) |
1024 | return err; | ||
1024 | 1025 | ||
1025 | strcpy(card->driver, "AMD7930"); | 1026 | strcpy(card->driver, "AMD7930"); |
1026 | strcpy(card->shortname, "Sun AMD7930"); | 1027 | strcpy(card->shortname, "Sun AMD7930"); |
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 41c387587474..7d93fa705ccf 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
@@ -1563,6 +1563,7 @@ static int __init cs4231_attach_begin(struct snd_card **rcard) | |||
1563 | { | 1563 | { |
1564 | struct snd_card *card; | 1564 | struct snd_card *card; |
1565 | struct snd_cs4231 *chip; | 1565 | struct snd_cs4231 *chip; |
1566 | int err; | ||
1566 | 1567 | ||
1567 | *rcard = NULL; | 1568 | *rcard = NULL; |
1568 | 1569 | ||
@@ -1574,10 +1575,10 @@ static int __init cs4231_attach_begin(struct snd_card **rcard) | |||
1574 | return -ENOENT; | 1575 | return -ENOENT; |
1575 | } | 1576 | } |
1576 | 1577 | ||
1577 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, | 1578 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, |
1578 | sizeof(struct snd_cs4231)); | 1579 | sizeof(struct snd_cs4231), &card); |
1579 | if (card == NULL) | 1580 | if (err < 0) |
1580 | return -ENOMEM; | 1581 | return err; |
1581 | 1582 | ||
1582 | strcpy(card->driver, "CS4231"); | 1583 | strcpy(card->driver, "CS4231"); |
1583 | strcpy(card->shortname, "Sun CS4231"); | 1584 | strcpy(card->shortname, "Sun CS4231"); |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 23ed6f04a718..af95ff1e126c 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
@@ -2612,10 +2612,10 @@ static int __devinit dbri_probe(struct of_device *op, const struct of_device_id | |||
2612 | return -ENODEV; | 2612 | return -ENODEV; |
2613 | } | 2613 | } |
2614 | 2614 | ||
2615 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, | 2615 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, |
2616 | sizeof(struct snd_dbri)); | 2616 | sizeof(struct snd_dbri), &card); |
2617 | if (card == NULL) | 2617 | if (err < 0) |
2618 | return -ENOMEM; | 2618 | return err; |
2619 | 2619 | ||
2620 | strcpy(card->driver, "DBRI"); | 2620 | strcpy(card->driver, "DBRI"); |
2621 | strcpy(card->shortname, "Sun DBRI"); | 2621 | strcpy(card->shortname, "Sun DBRI"); |