From: Takashi Iwai <tiwai@suse.de> To: alsa-devel@alsa-project.org Subject: [PATCH 16/24] ALSA: sparc: Convert to snd_card_new() with a device pointer Date: Wed, 12 Feb 2014 11:35:32 +0100 [thread overview] Message-ID: <1392201340-27113-17-git-send-email-tiwai@suse.de> (raw) In-Reply-To: <1392201340-27113-1-git-send-email-tiwai@suse.de> Also remove superfluous snd_card_set_dev() calls. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/sparc/amd7930.c | 4 ++-- sound/sparc/cs4231.c | 9 +++++---- sound/sparc/dbri.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c index 174d21fb56e2..4a85e1433472 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 dbb1b625eb2f..dabc1ad331e2 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; diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index eee7afcae375..be1b1aa96b7e 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; -- 1.8.5.2
next prev parent reply other threads:[~2014-02-12 10:35 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-02-12 10:35 [RFC PATCH 00/24] Mandate to pass a device pointer at card creation Takashi Iwai 2014-02-12 10:35 ` [PATCH 01/24] ALSA: Drop unused name argument in snd_register_oss_device() Takashi Iwai 2014-02-12 10:35 ` [PATCH 02/24] ALSA: Mandate to pass a device pointer at card creation time Takashi Iwai 2014-02-12 10:35 ` [PATCH 03/24] ALSA: drivers: Convert to snd_card_new() with a device pointer Takashi Iwai 2014-02-12 10:35 ` [PATCH 04/24] ALSA: isa: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 05/24] ALSA: pci: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 06/24] ALSA: usb: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 07/24] ALSA: firewire: " Takashi Iwai 2014-02-14 6:56 ` Takashi Sakamoto 2014-02-12 10:35 ` [PATCH 08/24] ALSA: arm: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 09/24] ALSA: atmel: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 10/24] ALSA: au1x00: convert to platform device Takashi Iwai 2014-02-14 0:19 ` Michał Mirosław 2014-02-14 7:33 ` Takashi Iwai 2014-02-12 10:35 ` [PATCH 11/24] ALSA: mips: Convert to snd_card_new() with a device pointer Takashi Iwai 2014-02-12 10:35 ` [PATCH 12/24] ALSA: parisc: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 13/24] ALSA: pcmcia: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 14/24] ALSA: ppc: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 15/24] ALSA: sh: " Takashi Iwai 2014-02-12 10:35 ` Takashi Iwai [this message] 2014-02-12 10:35 ` [PATCH 17/24] ALSA: spi: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 18/24] ASoC: core: " Takashi Iwai 2014-02-12 13:04 ` Mark Brown 2014-02-12 13:10 ` Takashi Iwai 2014-02-12 10:35 ` [PATCH 19/24] HID: prodikeys: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 20/24] [media] " Takashi Iwai 2014-02-12 10:35 ` [PATCH 21/24] thinkpad_acpi: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 22/24] staging/line6: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 23/24] staging/media: " Takashi Iwai 2014-02-12 10:35 ` [PATCH 24/24] usb: gadget: " Takashi Iwai 2014-02-14 11:58 ` [RFC PATCH 00/24] Mandate to pass a device pointer at card creation Takashi Iwai
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1392201340-27113-17-git-send-email-tiwai@suse.de \ --to=tiwai@suse.de \ --cc=alsa-devel@alsa-project.org \ --subject='Re: [PATCH 16/24] ALSA: sparc: Convert to snd_card_new() with a device pointer' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.