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 C2C12C001DF for ; Fri, 4 Aug 2023 10:50:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231681AbjHDKuG (ORCPT ); Fri, 4 Aug 2023 06:50:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230238AbjHDKtK (ORCPT ); Fri, 4 Aug 2023 06:49:10 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B071A4C3E for ; Fri, 4 Aug 2023 03:47:44 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id F0F2421860; Fri, 4 Aug 2023 10:46:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1691146011; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=d+RCvu64k2tkk7w/weX6gTH8M7RTUJSIekejqVZef5Q=; b=NLEQYOJ/t8VyF9gY23NkCvXsqhwrRWkh1Pv18sXNYlDkvOwxGPutG2CDJy2u7FmLwqiKE8 4c1T0Rt1Av5EsrNY0qNqdhTJu0tVJ5CCC7V4mFopq+7YiuX2kf0To8+g2hgSWSDWd28sS7 qBJw14vRQziH2MJlEGOsuMdBSxOM6po= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1691146011; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=d+RCvu64k2tkk7w/weX6gTH8M7RTUJSIekejqVZef5Q=; b=EqO4X27A48oKleqeso9rMvDzRqIJibaLjF0M1+htAgddFEP7VYz/kbbEruDJTBq+54OMPP /iP1awYKRHGtqaCA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C3F98133B5; Fri, 4 Aug 2023 10:46:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id DsKbLhvXzGRUPgAAMHmgww (envelope-from ); Fri, 04 Aug 2023 10:46:51 +0000 Date: Fri, 04 Aug 2023 12:46:51 +0200 Message-ID: <87msz79jac.wl-tiwai@suse.de> From: Takashi Iwai To: Ivan Orlov Cc: perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] ALSA: pcmtest: Move buffer iterator initialization to prepare callback In-Reply-To: <20230803152824.7531-1-ivan.orlov0322@gmail.com> References: <20230803152824.7531-1-ivan.orlov0322@gmail.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) Emacs/27.2 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 03 Aug 2023 17:28:24 +0200, Ivan Orlov wrote: > > Trigger callback is not the best place for buffer iterator > initialization, so move it out to the prepare callback, where it > have to be. > > Minor enhancement: remove redundant definitions and blank line. A blank line removal is OK, but other changes are too much to fold into. Please split. thanks, Takashi > > Signed-off-by: Ivan Orlov > --- > sound/drivers/pcmtest.c | 41 +++++++++++++++++++---------------------- > 1 file changed, 19 insertions(+), 22 deletions(-) > > diff --git a/sound/drivers/pcmtest.c b/sound/drivers/pcmtest.c > index 08e14b5eb772..7f170429eb8f 100644 > --- a/sound/drivers/pcmtest.c > +++ b/sound/drivers/pcmtest.c > @@ -41,8 +41,6 @@ > #include > #include > > -#define DEVNAME "pcmtestd" > -#define CARD_NAME "pcm-test-card" > #define TIMER_PER_SEC 5 > #define TIMER_INTERVAL (HZ / TIMER_PER_SEC) > #define DELAY_JIFFIES HZ > @@ -74,11 +72,11 @@ static u8 ioctl_reset_test; > static struct dentry *driver_debug_dir; > > module_param(index, int, 0444); > -MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard"); > +MODULE_PARM_DESC(index, "Index value for pcmtest soundcard"); > module_param(id, charp, 0444); > -MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard"); > +MODULE_PARM_DESC(id, "ID string for pcmtest soundcard"); > module_param(enable, bool, 0444); > -MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard."); > +MODULE_PARM_DESC(enable, "Enable pcmtest soundcard."); > module_param(fill_mode, short, 0600); > MODULE_PARM_DESC(fill_mode, "Buffer fill mode: rand(0) or pattern(1)"); > module_param(inject_delay, int, 0600); > @@ -92,7 +90,6 @@ MODULE_PARM_DESC(inject_trigger_err, "Inject EINVAL error in the 'trigger' callb > module_param(inject_open_err, bool, 0600); > MODULE_PARM_DESC(inject_open_err, "Inject EBUSY error in the 'open' callback"); > > - > struct pcmtst { > struct snd_pcm *pcm; > struct snd_card *card; > @@ -405,25 +402,9 @@ static int snd_pcmtst_pcm_close(struct snd_pcm_substream *substream) > > static int snd_pcmtst_pcm_trigger(struct snd_pcm_substream *substream, int cmd) > { > - struct snd_pcm_runtime *runtime = substream->runtime; > - struct pcmtst_buf_iter *v_iter = runtime->private_data; > - > if (inject_trigger_err) > return -EINVAL; > > - v_iter->sample_bytes = runtime->sample_bits / 8; > - v_iter->period_bytes = frames_to_bytes(runtime, runtime->period_size); > - if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED || > - runtime->access == SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED) { > - v_iter->chan_block = runtime->dma_bytes / runtime->channels; > - v_iter->interleaved = false; > - } else { > - v_iter->interleaved = true; > - } > - // We want to record RATE * ch_cnt samples per sec, it is rate * sample_bytes * ch_cnt bytes > - v_iter->s_rw_ch = runtime->rate / TIMER_PER_SEC; > - v_iter->b_rw = v_iter->s_rw_ch * v_iter->sample_bytes * runtime->channels; > - > return 0; > } > > @@ -454,8 +435,24 @@ static void pcmtst_pdev_release(struct device *dev) > > static int snd_pcmtst_pcm_prepare(struct snd_pcm_substream *substream) > { > + struct snd_pcm_runtime *runtime = substream->runtime; > + struct pcmtst_buf_iter *v_iter = runtime->private_data; > + > if (inject_prepare_err) > return -EINVAL; > + > + v_iter->sample_bytes = samples_to_bytes(runtime, 1); > + v_iter->period_bytes = snd_pcm_lib_period_bytes(substream); > + v_iter->interleaved = true; > + if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED || > + runtime->access == SNDRV_PCM_ACCESS_MMAP_NONINTERLEAVED) { > + v_iter->chan_block = snd_pcm_lib_buffer_bytes(substream) / runtime->channels; > + v_iter->interleaved = false; > + } > + // We want to record RATE * ch_cnt samples per sec, it is rate * sample_bytes * ch_cnt bytes > + v_iter->s_rw_ch = runtime->rate / TIMER_PER_SEC; > + v_iter->b_rw = v_iter->s_rw_ch * v_iter->sample_bytes * runtime->channels; > + > return 0; > } > > -- > 2.34.1 >