From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> To: Alex Riesen <alexander.riesen@cetitec.com>, Geert Uytterhoeven <geert@linux-m68k.org>, Mauro Carvalho Chehab <mchehab@kernel.org>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, devel@driverdev.osuosl.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: Re: [PATCH v5 6/9] media: adv748x: prepare/enable mclk when the audio is used Date: Thu, 18 Jun 2020 17:23:14 +0100 [thread overview] Message-ID: <646b0f32-2f83-281a-ccc0-eb88f82eb7a3@ideasonboard.com> (raw) In-Reply-To: <d9b7a7290e3d95b484a7a760484f827c3ed7651e.1585852001.git.alexander.riesen@cetitec.com> Hi Alex, On 02/04/2020 19:34, Alex Riesen wrote: > As there is nothing else (the consumers are supposed to do that) which > enables the clock, do it in the driver. > > Signed-off-by: Alexander Riesen <alexander.riesen@cetitec.com> > -- > > v3: added > --- > drivers/media/i2c/adv748x/adv748x-dai.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/i2c/adv748x/adv748x-dai.c b/drivers/media/i2c/adv748x/adv748x-dai.c > index c9191f8f1ca8..185f78023e91 100644 > --- a/drivers/media/i2c/adv748x/adv748x-dai.c > +++ b/drivers/media/i2c/adv748x/adv748x-dai.c > @@ -117,11 +117,22 @@ static int adv748x_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) > > static int adv748x_dai_startup(struct snd_pcm_substream *sub, struct snd_soc_dai *dai) > { > + int ret; > struct adv748x_state *state = state_of(dai); > > if (sub->stream != SNDRV_PCM_STREAM_CAPTURE) > return -EINVAL; this looks quite bunched up so : Newline... > - return set_audio_pads_state(state, 1); > + ret = set_audio_pads_state(state, 1); > + if (ret) > + goto fail; With no action required to cleanup here, I would just return ret; and remove the fail: label. Newline... > + ret = clk_prepare_enable(mclk_of(state)); > + if (ret) > + goto fail_pwdn; newline... > + return 0; newline... Other than that: Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > +fail_pwdn: > + set_audio_pads_state(state, 0); > +fail: > + return ret; > } > > static int adv748x_dai_hw_params(struct snd_pcm_substream *sub, > @@ -174,6 +185,7 @@ static void adv748x_dai_shutdown(struct snd_pcm_substream *sub, struct snd_soc_d > { > struct adv748x_state *state = state_of(dai); > > + clk_disable_unprepare(mclk_of(state)); > set_audio_pads_state(state, 0); > } > >
WARNING: multiple messages have this Message-ID (diff)
From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> To: Alex Riesen <alexander.riesen@cetitec.com>, Geert Uytterhoeven <geert@linux-m68k.org>, Mauro Carvalho Chehab <mchehab@kernel.org>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>, devel@driverdev.osuosl.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: Re: [PATCH v5 6/9] media: adv748x: prepare/enable mclk when the audio is used Date: Thu, 18 Jun 2020 17:23:14 +0100 [thread overview] Message-ID: <646b0f32-2f83-281a-ccc0-eb88f82eb7a3@ideasonboard.com> (raw) In-Reply-To: <d9b7a7290e3d95b484a7a760484f827c3ed7651e.1585852001.git.alexander.riesen@cetitec.com> Hi Alex, On 02/04/2020 19:34, Alex Riesen wrote: > As there is nothing else (the consumers are supposed to do that) which > enables the clock, do it in the driver. > > Signed-off-by: Alexander Riesen <alexander.riesen@cetitec.com> > -- > > v3: added > --- > drivers/media/i2c/adv748x/adv748x-dai.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/i2c/adv748x/adv748x-dai.c b/drivers/media/i2c/adv748x/adv748x-dai.c > index c9191f8f1ca8..185f78023e91 100644 > --- a/drivers/media/i2c/adv748x/adv748x-dai.c > +++ b/drivers/media/i2c/adv748x/adv748x-dai.c > @@ -117,11 +117,22 @@ static int adv748x_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) > > static int adv748x_dai_startup(struct snd_pcm_substream *sub, struct snd_soc_dai *dai) > { > + int ret; > struct adv748x_state *state = state_of(dai); > > if (sub->stream != SNDRV_PCM_STREAM_CAPTURE) > return -EINVAL; this looks quite bunched up so : Newline... > - return set_audio_pads_state(state, 1); > + ret = set_audio_pads_state(state, 1); > + if (ret) > + goto fail; With no action required to cleanup here, I would just return ret; and remove the fail: label. Newline... > + ret = clk_prepare_enable(mclk_of(state)); > + if (ret) > + goto fail_pwdn; newline... > + return 0; newline... Other than that: Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> > +fail_pwdn: > + set_audio_pads_state(state, 0); > +fail: > + return ret; > } > > static int adv748x_dai_hw_params(struct snd_pcm_substream *sub, > @@ -174,6 +185,7 @@ static void adv748x_dai_shutdown(struct snd_pcm_substream *sub, struct snd_soc_d > { > struct adv748x_state *state = state_of(dai); > > + clk_disable_unprepare(mclk_of(state)); > set_audio_pads_state(state, 0); > } > > _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2020-06-18 16:23 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-02 18:33 [PATCH v5 0/9] media: adv748x: add support for HDMI audio Alex Riesen 2020-04-02 18:33 ` Alex Riesen 2020-04-02 18:34 ` [PATCH v5 1/9] media: adv748x: fix end-of-line terminators in diagnostic statements Alex Riesen 2020-04-02 18:34 ` Alex Riesen 2020-04-03 10:43 ` Kieran Bingham 2020-04-03 10:43 ` Kieran Bingham 2020-04-03 11:01 ` Alex Riesen 2020-04-03 11:01 ` Alex Riesen 2020-04-02 18:34 ` [PATCH v5 2/9] media: adv748x: include everything adv748x.h needs into the file Alex Riesen 2020-04-02 18:34 ` Alex Riesen 2020-04-03 10:48 ` Kieran Bingham 2020-04-03 10:48 ` Kieran Bingham 2020-04-03 11:02 ` Alex Riesen 2020-04-03 11:02 ` Alex Riesen 2020-04-02 18:34 ` [PATCH v5 3/9] media: adv748x: reduce amount of code for bitwise modifications of device registers Alex Riesen 2020-04-02 18:34 ` Alex Riesen 2020-04-03 19:09 ` Kieran Bingham 2020-04-03 19:09 ` Kieran Bingham 2020-04-02 18:34 ` [PATCH v5 4/9] media: adv748x: add definitions for audio output related registers Alex Riesen 2020-04-02 18:34 ` Alex Riesen 2020-04-07 16:21 ` Kieran Bingham 2020-04-07 16:21 ` Kieran Bingham 2020-04-07 17:13 ` Alex Riesen 2020-04-07 17:13 ` Alex Riesen 2020-04-07 18:44 ` Kieran Bingham 2020-04-07 18:44 ` Kieran Bingham 2020-04-07 18:55 ` Alex Riesen 2020-04-07 18:55 ` Alex Riesen 2020-04-02 18:34 ` [PATCH v5 5/9] media: adv748x: add support for HDMI audio Alex Riesen 2020-04-02 18:34 ` Alex Riesen 2020-04-02 18:34 ` [PATCH v5 6/9] media: adv748x: prepare/enable mclk when the audio is used Alex Riesen 2020-04-02 18:34 ` Alex Riesen 2020-06-18 16:23 ` Kieran Bingham [this message] 2020-06-18 16:23 ` Kieran Bingham 2020-06-19 8:51 ` Alex Riesen 2020-06-19 8:51 ` Alex Riesen 2020-04-02 18:34 ` [PATCH v5 7/9] media: adv748x: only activate DAI if it is described in device tree Alex Riesen 2020-04-02 18:34 ` Alex Riesen 2020-06-18 16:17 ` Kieran Bingham 2020-06-18 16:17 ` Kieran Bingham 2020-06-19 9:10 ` Alex Riesen 2020-06-19 9:10 ` Alex Riesen 2020-04-02 18:35 ` [PATCH v5 8/9] dt-bindings: adv748x: add information about serial audio interface (I2S/TDM) Alex Riesen 2020-04-02 18:35 ` Alex Riesen 2020-06-18 16:27 ` Kieran Bingham 2020-06-18 16:27 ` Kieran Bingham 2020-04-02 18:35 ` [PATCH v5 9/9] arm64: dts: renesas: salvator: add a connection from adv748x codec (HDMI input) to the R-Car SoC Alex Riesen 2020-04-02 18:35 ` Alex Riesen 2020-06-18 16:32 ` Kieran Bingham 2020-06-18 16:32 ` Kieran Bingham 2020-06-19 9:34 ` Alex Riesen 2020-06-19 9:34 ` Alex Riesen 2020-08-25 14:57 ` Kieran Bingham 2020-08-25 14:57 ` Kieran Bingham 2020-09-14 8:17 ` Alex Riesen 2020-09-14 8:17 ` Alex Riesen
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=646b0f32-2f83-281a-ccc0-eb88f82eb7a3@ideasonboard.com \ --to=kieran.bingham+renesas@ideasonboard.com \ --cc=alexander.riesen@cetitec.com \ --cc=devel@driverdev.osuosl.org \ --cc=devicetree@vger.kernel.org \ --cc=geert@linux-m68k.org \ --cc=hverkuil-cisco@xs4all.nl \ --cc=kuninori.morimoto.gx@renesas.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-media@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mchehab@kernel.org \ --cc=robh+dt@kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.