From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48E65C04FDF for ; Mon, 14 Aug 2023 12:34:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230291AbjHNMeX (ORCPT ); Mon, 14 Aug 2023 08:34:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229718AbjHNMeT (ORCPT ); Mon, 14 Aug 2023 08:34:19 -0400 Received: from iodev.co.uk (iodev.co.uk [46.30.189.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 12AC1CC; Mon, 14 Aug 2023 05:34:17 -0700 (PDT) Received: from pirotess (80.red-83-50-209.dynamicip.rima-tde.net [83.50.209.80]) by iodev.co.uk (Postfix) with ESMTPSA id 7D29920891F; Mon, 14 Aug 2023 14:15:20 +0200 (CEST) Date: Mon, 14 Aug 2023 14:15:18 +0200 From: Ismael Luceno To: Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Bluecherry Maintainers , Anton Sviridenko , Andrey Utkin , Mauro Carvalho Chehab , linux-media@vger.kernel.org Subject: Re: [PATCH 17/25] media: solo6x10: Convert to generic PCM copy ops Message-ID: References: <20230814115523.15279-1-tiwai@suse.de> <20230814115523.15279-18-tiwai@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230814115523.15279-18-tiwai@suse.de> X-Spam: Yes Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 14/Aug/2023 13:55, Takashi Iwai wrote: > This patch converts the solo6x10 driver code to use the new unified > PCM copy callback. It's a straightforward conversion from *_user() to > *_iter() variants. As copy_to_iter() updates the internal offest at > each write, we can drop the dst counter update in the loop, too. > > Note that copy_from/to_iter() returns the copied bytes, hence the > error condition is inverted from copy_from/to_user(). > > Cc: Bluecherry Maintainers > Cc: Anton Sviridenko > Cc: Andrey Utkin > Cc: Ismael Luceno > Cc: Mauro Carvalho Chehab > Cc: linux-media@vger.kernel.org > Signed-off-by: Takashi Iwai > --- > drivers/media/pci/solo6x10/solo6x10-g723.c | 38 +++------------------- > 1 file changed, 5 insertions(+), 33 deletions(-) > > diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c > index 6cebad665565..aceacb822cab 100644 > --- a/drivers/media/pci/solo6x10/solo6x10-g723.c > +++ b/drivers/media/pci/solo6x10/solo6x10-g723.c > @@ -204,9 +204,9 @@ static snd_pcm_uframes_t snd_solo_pcm_pointer(struct snd_pcm_substream *ss) > return idx * G723_FRAMES_PER_PAGE; > } > > -static int snd_solo_pcm_copy_user(struct snd_pcm_substream *ss, int channel, > - unsigned long pos, void __user *dst, > - unsigned long count) > +static int snd_solo_pcm_copy(struct snd_pcm_substream *ss, int channel, > + unsigned long pos, struct iov_iter *dst, > + unsigned long count) > { > struct solo_snd_pcm *solo_pcm = snd_pcm_substream_chip(ss); > struct solo_dev *solo_dev = solo_pcm->solo_dev; > @@ -223,35 +223,8 @@ static int snd_solo_pcm_copy_user(struct snd_pcm_substream *ss, int channel, > if (err) > return err; > > - if (copy_to_user(dst, solo_pcm->g723_buf, G723_PERIOD_BYTES)) > + if (!copy_to_iter(solo_pcm->g723_buf, G723_PERIOD_BYTES, dst)) > return -EFAULT; > - dst += G723_PERIOD_BYTES; > - } > - > - return 0; > -} > - > -static int snd_solo_pcm_copy_kernel(struct snd_pcm_substream *ss, int channel, > - unsigned long pos, void *dst, > - unsigned long count) > -{ > - struct solo_snd_pcm *solo_pcm = snd_pcm_substream_chip(ss); > - struct solo_dev *solo_dev = solo_pcm->solo_dev; > - int err, i; > - > - for (i = 0; i < (count / G723_FRAMES_PER_PAGE); i++) { > - int page = (pos / G723_FRAMES_PER_PAGE) + i; > - > - err = solo_p2m_dma_t(solo_dev, 0, solo_pcm->g723_dma, > - SOLO_G723_EXT_ADDR(solo_dev) + > - (page * G723_PERIOD_BLOCK) + > - (ss->number * G723_PERIOD_BYTES), > - G723_PERIOD_BYTES, 0, 0); > - if (err) > - return err; > - > - memcpy(dst, solo_pcm->g723_buf, G723_PERIOD_BYTES); > - dst += G723_PERIOD_BYTES; > } > > return 0; > @@ -263,8 +236,7 @@ static const struct snd_pcm_ops snd_solo_pcm_ops = { > .prepare = snd_solo_pcm_prepare, > .trigger = snd_solo_pcm_trigger, > .pointer = snd_solo_pcm_pointer, > - .copy_user = snd_solo_pcm_copy_user, > - .copy_kernel = snd_solo_pcm_copy_kernel, > + .copy = snd_solo_pcm_copy, > }; > > static int snd_solo_capture_volume_info(struct snd_kcontrol *kcontrol, > -- > 2.35.3 > Signed-off-by: Ismael Luceno