From: Takashi Iwai <tiwai@suse.de> To: alsa-devel@alsa-project.org Subject: [PATCH 23/24] staging/media: Convert to snd_card_new() with a device pointer Date: Wed, 12 Feb 2014 11:35:39 +0100 [thread overview] Message-ID: <1392201340-27113-24-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> --- drivers/staging/media/go7007/snd-go7007.c | 5 ++--- drivers/staging/media/solo6x10/solo6x10-g723.c | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/go7007/snd-go7007.c b/drivers/staging/media/go7007/snd-go7007.c index 16dd64920767..9eb2a20ae40a 100644 --- a/drivers/staging/media/go7007/snd-go7007.c +++ b/drivers/staging/media/go7007/snd-go7007.c @@ -245,8 +245,8 @@ int go7007_snd_init(struct go7007 *go) spin_lock_init(&gosnd->lock); gosnd->hw_ptr = gosnd->w_idx = gosnd->avail = 0; gosnd->capturing = 0; - ret = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, - &gosnd->card); + ret = snd_card_new(go->dev, index[dev], id[dev], THIS_MODULE, 0, + &gosnd->card); if (ret < 0) { kfree(gosnd); return ret; @@ -257,7 +257,6 @@ int go7007_snd_init(struct go7007 *go) kfree(gosnd); return ret; } - snd_card_set_dev(gosnd->card, go->dev); ret = snd_pcm_new(gosnd->card, "go7007", 0, 0, 1, &gosnd->pcm); if (ret < 0) { snd_card_free(gosnd->card); diff --git a/drivers/staging/media/solo6x10/solo6x10-g723.c b/drivers/staging/media/solo6x10/solo6x10-g723.c index 1db18c7972a0..74f037b6166c 100644 --- a/drivers/staging/media/solo6x10/solo6x10-g723.c +++ b/drivers/staging/media/solo6x10/solo6x10-g723.c @@ -366,8 +366,9 @@ int solo_g723_init(struct solo_dev *solo_dev) /* Allows for easier mapping between video and audio */ sprintf(name, "Softlogic%d", solo_dev->vfd->num); - ret = snd_card_create(SNDRV_DEFAULT_IDX1, name, THIS_MODULE, 0, - &solo_dev->snd_card); + ret = snd_card_new(&solo_dev->pdev->dev, + SNDRV_DEFAULT_IDX1, name, THIS_MODULE, 0, + &solo_dev->snd_card); if (ret < 0) return ret; @@ -377,7 +378,6 @@ int solo_g723_init(struct solo_dev *solo_dev) strcpy(card->shortname, "SOLO-6x10 Audio"); sprintf(card->longname, "%s on %s IRQ %d", card->shortname, pci_name(solo_dev->pdev), solo_dev->pdev->irq); - snd_card_set_dev(card, &solo_dev->pdev->dev); ret = snd_device_new(card, SNDRV_DEV_LOWLEVEL, solo_dev, &ops); if (ret < 0) -- 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 ` [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 ` Takashi Iwai [this message] 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-24-git-send-email-tiwai@suse.de \ --to=tiwai@suse.de \ --cc=alsa-devel@alsa-project.org \ --subject='Re: [PATCH 23/24] staging/media: 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.