From: Takashi Iwai <tiwai@suse.de> To: alsa-devel@alsa-project.org Subject: [PATCH 13/24] ALSA: pcmcia: Convert to snd_card_new() with a device pointer Date: Wed, 12 Feb 2014 11:35:29 +0100 Message-ID: <1392201340-27113-14-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/pcmcia/pdaudiocf/pdaudiocf.c | 5 ++--- sound/pcmcia/vx/vxpocket.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 8f489de5c4c6..56bda124cd4a 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c @@ -112,7 +112,8 @@ static int snd_pdacf_probe(struct pcmcia_device *link) return -ENODEV; /* disabled explicitly */ /* ok, create a card instance */ - err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card); + err = snd_card_new(&link->dev, index[i], id[i], THIS_MODULE, + 0, &card); if (err < 0) { snd_printk(KERN_ERR "pdacf: cannot create a card instance\n"); return err; @@ -131,8 +132,6 @@ static int snd_pdacf_probe(struct pcmcia_device *link) return err; } - snd_card_set_dev(card, &link->dev); - pdacf->index = i; card_list[i] = card; diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index d4db7ecaa6bf..786e7e139c9e 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c @@ -238,7 +238,6 @@ static int vxpocket_config(struct pcmcia_device *link) goto failed; chip->dev = &link->dev; - snd_card_set_dev(chip->card, chip->dev); if (snd_vxpocket_assign_resources(chip, link->resource[0]->start, link->irq) < 0) @@ -307,7 +306,8 @@ static int vxpocket_probe(struct pcmcia_device *p_dev) return -ENODEV; /* disabled explicitly */ /* ok, create a card instance */ - err = snd_card_create(index[i], id[i], THIS_MODULE, 0, &card); + err = snd_card_new(&p_dev->dev, index[i], id[i], THIS_MODULE, + 0, &card); if (err < 0) { snd_printk(KERN_ERR "vxpocket: cannot create a card instance\n"); return err; -- 1.8.5.2
next prev parent reply index 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 ` Takashi Iwai [this message] 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 ` [PATCH 16/24] ALSA: sparc: " Takashi Iwai 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-14-git-send-email-tiwai@suse.de \ --to=tiwai@suse.de \ --cc=alsa-devel@alsa-project.org \ /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
Alsa-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \ alsa-devel@alsa-project.org public-inbox-index alsa-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git