Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1471864ybt; Thu, 18 Jun 2020 09:25:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxmDYIyQsAme/cYEceFYDcD+ssYwgzA0fAYTAVamZdFzaccPE2l7EGpXbWqQS0vndYZLqo2 X-Received: by 2002:a17:906:68ca:: with SMTP id y10mr4562247ejr.322.1592497537197; Thu, 18 Jun 2020 09:25:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592497537; cv=none; d=google.com; s=arc-20160816; b=M+lsOmgDY2W+PTjexZMli+X7+3bU81shz/AMRlangPcoGiy8LDxyirBi4DaGqksGlk GkInr4TrD2fYE4OBZfIt1arybp6Vi99ZDtXYWDeNVy/6Sz6b6bfdr+nukxdkH6YMrm55 D9Kuy6QAxRRHL1fDwfEyqCghUMuleX/lORoEplq/lFoHotGvIGIsR1dekml4w/S4E/9E 5WccBJt+gZLLT5kL/FbVoZinfOvRFJz6QDhH2OKNPAZqyfxR1eO2FoyAZIOrms4urvfM 6MHTtRuLHXniSg+1vadxY7Q0kpbeN54JhPfqEnimGiMlW6FFkQp/AQybCv1N5WUgu1Oj CKDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:organization:from:references:to:subject:reply-to :dkim-signature; bh=exHjYwJVFbCW06jbFoQ7tTiOtfDS4nvxMoXAaM1ZotU=; b=iHq+W4bMDfbkz+rdyvZJXLWTJcOgw+qsk47d4fk3Lw1MI3rK7jyHTicSgn4cp4y6qQ pnnmtjl4p2u6wx5cYz7tI4V4QiZYUFKns47nZO/KfM+qE1HHiK4o1tUPN23YTeipd+Fg Ld3CyZT4XMdVhxrGEcP5Cqi7xSh/sWN7hsBOItpJrNGTfTkKz2u0tdAbnTSmoX62Et1z iIcktX42b1rrmonSgqwKdKVqtdX3W7v/fA3hxG/cVX3BwmgYwLWzw70Me+P+8Iy6AaZc 7msNOpXZa3uIp/7pt8TBYwdZgDhCTu63HvYogE6h1msaCfQt2EOwpwMuxCvjVBjIbRgb yHPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=EuLaR5r3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id oi20si2079388ejb.571.2020.06.18.09.25.14; Thu, 18 Jun 2020 09:25:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=EuLaR5r3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730483AbgFRQXV (ORCPT + 99 others); Thu, 18 Jun 2020 12:23:21 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:37846 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726981AbgFRQXU (ORCPT ); Thu, 18 Jun 2020 12:23:20 -0400 Received: from [192.168.0.20] (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 8A5A2F9; Thu, 18 Jun 2020 18:23:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592497398; bh=/cd/RPu/vuGMr1gt5mZp5+oG7+iJ6WX/U8t/ogBZIO8=; h=Reply-To:Subject:To:References:From:Date:In-Reply-To:From; b=EuLaR5r33jTj9RDJPNe9yDCQxR8Z5pJsFzYONOdzg7Wr/c1tiPV9F4fHejN774aGX gNl/Y11ebZVsi+tFOylADYqCG2snXAscCHtjurgqc1x6v8AVJh1EBXqd6qvVc1cFmn jk7y6luLxzWYc4H/qZEispBLVZIa9Cevv/AfM3MQ= Reply-To: kieran.bingham+renesas@ideasonboard.com Subject: Re: [PATCH v5 6/9] media: adv748x: prepare/enable mclk when the audio is used To: Alex Riesen , Geert Uytterhoeven , Mauro Carvalho Chehab , Hans Verkuil , Laurent Pinchart , Rob Herring , Mark Rutland , Kuninori Morimoto , devel@driverdev.osuosl.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org References: From: Kieran Bingham Organization: Ideas on Board Message-ID: <646b0f32-2f83-281a-ccc0-eb88f82eb7a3@ideasonboard.com> Date: Thu, 18 Jun 2020 17:23:14 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > -- > > 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 > +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); > } > >