From: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org,
linux-media <linux-media@vger.kernel.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Subject: Re: [PATCH] media: Drop superfluous PCM preallocation error checks
Date: Wed, 6 Feb 2019 14:36:05 -0300 [thread overview]
Message-ID: <CAAEAJfA2fr6XwL-k9xNqToFypUZ-CvfotJpq6EHDBNiEgmCO8g@mail.gmail.com> (raw)
In-Reply-To: <20190206173239.18046-1-tiwai@suse.de>
On Wed, 6 Feb 2019 at 14:32, Takashi Iwai <tiwai@suse.de> wrote:
>
> snd_pcm_lib_preallocate_pages() and co always succeed, so the error
> check is simply redundant. Drop it.
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
>
> This is a piece I overlooked in the previous patchset:
> https://www.spinics.net/lists/alsa-devel/msg87223.html
>
> Media people, please give ACK if this is OK. Then I'll merge it together
> with other relevant patches. Thanks!
>
> drivers/media/pci/solo6x10/solo6x10-g723.c | 4 +---
> drivers/media/pci/tw686x/tw686x-audio.c | 3 ++-
tw686x changes look good.
Acked-by: Ezequiel Garcia <ezequiel@collabora.com>
Thanks,
Eze
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
> index 2cc05a9d57ac..a16242a9206f 100644
> --- a/drivers/media/pci/solo6x10/solo6x10-g723.c
> +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
> @@ -360,13 +360,11 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
> ss; ss = ss->next, i++)
> sprintf(ss->name, "Camera #%d Audio", i);
>
> - ret = snd_pcm_lib_preallocate_pages_for_all(pcm,
> + snd_pcm_lib_preallocate_pages_for_all(pcm,
> SNDRV_DMA_TYPE_CONTINUOUS,
> snd_dma_continuous_data(GFP_KERNEL),
> G723_PERIOD_BYTES * PERIODS,
> G723_PERIOD_BYTES * PERIODS);
> - if (ret < 0)
> - return ret;
>
> solo_dev->snd_pcm = pcm;
>
> diff --git a/drivers/media/pci/tw686x/tw686x-audio.c b/drivers/media/pci/tw686x/tw686x-audio.c
> index a28329698e20..fb0e7573b5ae 100644
> --- a/drivers/media/pci/tw686x/tw686x-audio.c
> +++ b/drivers/media/pci/tw686x/tw686x-audio.c
> @@ -301,11 +301,12 @@ static int tw686x_snd_pcm_init(struct tw686x_dev *dev)
> ss; ss = ss->next, i++)
> snprintf(ss->name, sizeof(ss->name), "vch%u audio", i);
>
> - return snd_pcm_lib_preallocate_pages_for_all(pcm,
> + snd_pcm_lib_preallocate_pages_for_all(pcm,
> SNDRV_DMA_TYPE_DEV,
> snd_dma_pci_data(dev->pci_dev),
> TW686X_AUDIO_PAGE_MAX * AUDIO_DMA_SIZE_MAX,
> TW686X_AUDIO_PAGE_MAX * AUDIO_DMA_SIZE_MAX);
> + return 0;
> }
>
> static void tw686x_audio_dma_free(struct tw686x_dev *dev,
> --
> 2.16.4
>
--
Ezequiel García, VanguardiaSur
www.vanguardiasur.com.ar
next prev parent reply other threads:[~2019-02-06 17:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 17:32 [PATCH] media: Drop superfluous PCM preallocation error checks Takashi Iwai
2019-02-06 17:36 ` Ezequiel Garcia [this message]
2019-03-12 8:13 ` Hans Verkuil
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=CAAEAJfA2fr6XwL-k9xNqToFypUZ-CvfotJpq6EHDBNiEgmCO8g@mail.gmail.com \
--to=ezequiel@vanguardiasur.com.ar \
--cc=alsa-devel@alsa-project.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=tiwai@suse.de \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).