Message ID | c14058c4b7018556a78455ffef484a7ebe4d8ea2.1666357434.git.mazziesaccount@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp699905wrr; Fri, 21 Oct 2022 06:32:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5zEwDKIK1LFibNgmfX+XxGIA12LS+fkogAkYD83qpCbAiqtvh+KyxVQ/rozoHpGA9OnTGy X-Received: by 2002:a17:90a:c250:b0:20a:e484:63aa with SMTP id d16-20020a17090ac25000b0020ae48463aamr22657586pjx.0.1666359129244; Fri, 21 Oct 2022 06:32:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666359129; cv=none; d=google.com; s=arc-20160816; b=Z03owFvoMfkYbuv/II35FS5+oh02WWDTU4ZtuQm9efUGuSvI4TIu6NcFbiwv0DFzpz U8swV05h9+S3SX6KkMvjNGagheLGaQIzDdjboLsvcrZCtoZUiG3WS0pJ7szke+ySP/yy N7e2YoeoQi7R/ZZJ01GEv7z4IH1O6ktX4gm7Jrc04tjWSY5yTRMObsRzXfWovYsLwBN3 fNYucYtNLWGcEHtmw3Sr4FeNf7/wp/ucgNi6YkQ9o+F6CCDJlJcoMvR3zXQ9+974ORId Ul88BC6IsTBFdzRJ/c9XkWdclI8azA+Ufp8WFADyi/szooJ6TMQFPtLhNrgT1/o3PzZF FPTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=ihyfIhpnzq65oKa3RDOB7v3ysoQ+yvmg3Y0WFsPd1bw=; b=DYv6idxpm3Uc/e1Fq9t/8Eh469jNfhVMKqs31w4tdgzgFItdKzea7RrN0v0pOLKqvV wU5woyuOpZW+O3Du9yfLQ5x7qnkShTGyoJh31YWieo/JnFEZrgMOMfC6s3nmlbnDz5rz jK+H1AUOOKc/ly04NloRu8zWpLPFYgBB7IhlSZoPW/Z8FpIfSH5d4cHGHNRJYuju87Lz wlS0KhqdQQjLvPLHuyVzIeOy5PIhJqArQqeIQfC9ao28eVQTXE5epVgOdBgoxV/GbNU9 3mSybojKd5oIufe8LiVIn9ZdGqSGWKHSPJIOy5++ZhqtfQJScu5Qeymok6b8wU4zbG/h 9IIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=I9NeRnvm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l5-20020a63f305000000b0045fdb4fca50si26906991pgh.330.2022.10.21.06.31.54; Fri, 21 Oct 2022 06:32:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=I9NeRnvm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230431AbiJUNSv (ORCPT <rfc822;pwkd43@gmail.com> + 99 others); Fri, 21 Oct 2022 09:18:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230432AbiJUNSc (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Fri, 21 Oct 2022 09:18:32 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EF9027354E; Fri, 21 Oct 2022 06:18:10 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id b1so5049344lfs.7; Fri, 21 Oct 2022 06:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=ihyfIhpnzq65oKa3RDOB7v3ysoQ+yvmg3Y0WFsPd1bw=; b=I9NeRnvmBddsliQwQ2JpFRY+yBhvSinkJq/RCwn5uMf4MgZObYFZAv/iOK3QP8HDji 9FhiOcX3yboLmgid/jqKyVngYBvuPvf5BkzKMNFWrL8KQT1Tl6iFXObUupxvMPyj6ipV hTwvZClXLoQOmaru2RChDi02M5YSHTfFduAL2+4oTQGWTpzWlEA43DlIrC6Xrq73NH5O 7Zs1g3PN9W+9D9GL2WBG90EoQeCFaYYsg3kjewxiPQUlMaz2PZmj+0fcCPZO2Un+43ag 2qgx1yDok3Bs6op5lq+uaO6uVmesvlIp5o4EQAeDUAca5dg6zkwSVqXiapNee7MfkIoj SUGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=ihyfIhpnzq65oKa3RDOB7v3ysoQ+yvmg3Y0WFsPd1bw=; b=jVb9PcnpXr+uEaKDgc7OtKLl5ba5omCn5WlvLO1hVWXNw1jF8Pxl9sU64NjFke7OwZ haG4gaZI0rCSqapdDdj9So+Ib78bAdqYRlKDcxDfdmyBAfBDxPhg2VEBPpmzBDvRnmqk K5bHOPttgiGIlb5N3ndlhoXVAKeuUiDbR/Z9rlVb2hwarP3eHbblDyDNGWmSCgyMafb6 rmSg2+mJeSQKVZfzJwRGWdRW4ZO0Brfr9A/XzwlsUcJ33E4u9Nh91wBGaSAKuW1uQ6JS phV3F5a1nfJFKavn91hYeSKKDlnbcgO0lPES7EJ/n/yCn4FxGctovhTxciwpoYKzUr/H PPzA== X-Gm-Message-State: ACrzQf0L6qSqccQb1TD9EYuWqPnTUsGt/szVCz37x4LBkCLtgBnlFJK9 MWVbacdBtVHeWTxSaIExM8o= X-Received: by 2002:a05:6512:3085:b0:4a2:7d80:d4b4 with SMTP id z5-20020a056512308500b004a27d80d4b4mr7150541lfd.534.1666358288796; Fri, 21 Oct 2022 06:18:08 -0700 (PDT) Received: from dc75zzyyyyyyyyyyyyyby-3.rev.dnainternet.fi (dc75zzyyyyyyyyyyyyyby-3.rev.dnainternet.fi. [2001:14ba:16f3:4a00::2]) by smtp.gmail.com with ESMTPSA id a13-20020a056512200d00b00494747ba5f7sm2210665lfb.272.2022.10.21.06.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Oct 2022 06:18:07 -0700 (PDT) Date: Fri, 21 Oct 2022 16:18:01 +0300 From: Matti Vaittinen <mazziesaccount@gmail.com> To: Matti Vaittinen <mazziesaccount@gmail.com>, Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> Cc: Andrzej Hajda <andrzej.hajda@intel.com>, Neil Armstrong <neil.armstrong@linaro.org>, Robert Foss <robert.foss@linaro.org>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, Jonas Karlman <jonas@kwiboo.se>, Jernej Skrabec <jernej.skrabec@gmail.com>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Kevin Hilman <khilman@baylibre.com>, Jerome Brunet <jbrunet@baylibre.com>, Martin Blumenstingl <martin.blumenstingl@googlemail.com>, Michael Hennerich <Michael.Hennerich@analog.com>, Jean Delvare <jdelvare@suse.com>, Guenter Roeck <linux@roeck-us.net>, Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-hwmon@vger.kernel.org Subject: [PATCH v4 1/4] gpu: drm: meson: Use devm_regulator_*get_enable*() Message-ID: <c14058c4b7018556a78455ffef484a7ebe4d8ea2.1666357434.git.mazziesaccount@gmail.com> References: <cover.1666357434.git.mazziesaccount@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="I73xNqd38oT7/msC" Content-Disposition: inline In-Reply-To: <cover.1666357434.git.mazziesaccount@gmail.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747304181047861852?= X-GMAIL-MSGID: =?utf-8?q?1747304190291200704?= |
Series |
Use devm helpers for regulator get and enable
|
|
Commit Message
Matti Vaittinen
Oct. 21, 2022, 1:18 p.m. UTC
Simplify using the devm_regulator_get_enable_optional(). Also drop the
seemingly unused struct member 'hdmi_supply'.
Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com>
---
v3 => v4:
- split meson part to own patch
RFCv1 => v2:
- Change also sii902x to use devm_regulator_bulk_get_enable()
Please note - this is only compile-tested due to the lack of HW. Careful
review and testing is _highly_ appreciated.
---
drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +++--------------------
1 file changed, 3 insertions(+), 20 deletions(-)
Comments
Hi Matti, On Fri, Oct 21, 2022 at 04:18:01PM +0300, Matti Vaittinen wrote: > Simplify using the devm_regulator_get_enable_optional(). Also drop the > seemingly unused struct member 'hdmi_supply'. > > Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> > > --- > v3 => v4: > - split meson part to own patch > > RFCv1 => v2: > - Change also sii902x to use devm_regulator_bulk_get_enable() > > Please note - this is only compile-tested due to the lack of HW. Careful > review and testing is _highly_ appreciated. > --- > drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +++-------------------- > 1 file changed, 3 insertions(+), 20 deletions(-) > > diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c > index 5cd2b2ebbbd3..7642f740272b 100644 > --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c > +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c > @@ -140,7 +140,6 @@ struct meson_dw_hdmi { > struct reset_control *hdmitx_apb; > struct reset_control *hdmitx_ctrl; > struct reset_control *hdmitx_phy; > - struct regulator *hdmi_supply; > u32 irq_stat; > struct dw_hdmi *hdmi; > struct drm_bridge *bridge; > @@ -665,11 +664,6 @@ static void meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi) > > } > > -static void meson_disable_regulator(void *data) > -{ > - regulator_disable(data); > -} > - > static void meson_disable_clk(void *data) > { > clk_disable_unprepare(data); > @@ -723,20 +717,9 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, > meson_dw_hdmi->data = match; > dw_plat_data = &meson_dw_hdmi->dw_plat_data; > > - meson_dw_hdmi->hdmi_supply = devm_regulator_get_optional(dev, "hdmi"); > - if (IS_ERR(meson_dw_hdmi->hdmi_supply)) { > - if (PTR_ERR(meson_dw_hdmi->hdmi_supply) == -EPROBE_DEFER) > - return -EPROBE_DEFER; > - meson_dw_hdmi->hdmi_supply = NULL; > - } else { > - ret = regulator_enable(meson_dw_hdmi->hdmi_supply); > - if (ret) > - return ret; > - ret = devm_add_action_or_reset(dev, meson_disable_regulator, > - meson_dw_hdmi->hdmi_supply); > - if (ret) > - return ret; > - } > + ret = devm_regulator_get_enable_optional(dev, "hdmi"); > + if (ret != -ENODEV) > + return ret; As noted in the review of the series that introduced devm_regulator_get_enable_optional(), the right thing to do is to implement runtime PM in this driver to avoid wasting power. > > meson_dw_hdmi->hdmitx_apb = devm_reset_control_get_exclusive(dev, > "hdmitx_apb");
Hi, On 21/10/2022 17:02, Laurent Pinchart wrote: > Hi Matti, > > On Fri, Oct 21, 2022 at 04:18:01PM +0300, Matti Vaittinen wrote: >> Simplify using the devm_regulator_get_enable_optional(). Also drop the >> seemingly unused struct member 'hdmi_supply'. >> >> Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> >> >> --- >> v3 => v4: >> - split meson part to own patch >> >> RFCv1 => v2: >> - Change also sii902x to use devm_regulator_bulk_get_enable() >> >> Please note - this is only compile-tested due to the lack of HW. Careful >> review and testing is _highly_ appreciated. >> --- >> drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +++-------------------- >> 1 file changed, 3 insertions(+), 20 deletions(-) >> >> diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c >> index 5cd2b2ebbbd3..7642f740272b 100644 >> --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c >> +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c >> @@ -140,7 +140,6 @@ struct meson_dw_hdmi { >> struct reset_control *hdmitx_apb; >> struct reset_control *hdmitx_ctrl; >> struct reset_control *hdmitx_phy; >> - struct regulator *hdmi_supply; >> u32 irq_stat; >> struct dw_hdmi *hdmi; >> struct drm_bridge *bridge; >> @@ -665,11 +664,6 @@ static void meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi) >> >> } >> >> -static void meson_disable_regulator(void *data) >> -{ >> - regulator_disable(data); >> -} >> - >> static void meson_disable_clk(void *data) >> { >> clk_disable_unprepare(data); >> @@ -723,20 +717,9 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, >> meson_dw_hdmi->data = match; >> dw_plat_data = &meson_dw_hdmi->dw_plat_data; >> >> - meson_dw_hdmi->hdmi_supply = devm_regulator_get_optional(dev, "hdmi"); >> - if (IS_ERR(meson_dw_hdmi->hdmi_supply)) { >> - if (PTR_ERR(meson_dw_hdmi->hdmi_supply) == -EPROBE_DEFER) >> - return -EPROBE_DEFER; >> - meson_dw_hdmi->hdmi_supply = NULL; >> - } else { >> - ret = regulator_enable(meson_dw_hdmi->hdmi_supply); >> - if (ret) >> - return ret; >> - ret = devm_add_action_or_reset(dev, meson_disable_regulator, >> - meson_dw_hdmi->hdmi_supply); >> - if (ret) >> - return ret; >> - } >> + ret = devm_regulator_get_enable_optional(dev, "hdmi"); >> + if (ret != -ENODEV) >> + return ret; > > As noted in the review of the series that introduced > devm_regulator_get_enable_optional(), the right thing to do is to > implement runtime PM in this driver to avoid wasting power. While I agree, it's not really the same level of effort as this patch should be functionally equivalent. > >> >> meson_dw_hdmi->hdmitx_apb = devm_reset_control_get_exclusive(dev, >> "hdmitx_apb"); > Neil
On 10/21/22 18:29, Neil Armstrong wrote: > Hi, > > On 21/10/2022 17:02, Laurent Pinchart wrote: >> Hi Matti, >> >> On Fri, Oct 21, 2022 at 04:18:01PM +0300, Matti Vaittinen wrote: >>> Simplify using the devm_regulator_get_enable_optional(). Also drop the >>> seemingly unused struct member 'hdmi_supply'. >>> >>> Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> >>> >>> --- >>> v3 => v4: >>> - split meson part to own patch >>> >>> RFCv1 => v2: >>> - Change also sii902x to use devm_regulator_bulk_get_enable() >>> >>> Please note - this is only compile-tested due to the lack of HW. Careful >>> review and testing is _highly_ appreciated. >>> --- //Snip >> >> As noted in the review of the series that introduced >> devm_regulator_get_enable_optional(), the right thing to do is to >> implement runtime PM in this driver to avoid wasting power. > > While I agree, it's not really the same level of effort as this patch > should be functionally equivalent. > Exactly. As I wrote, I do not have the HW to test this change. This intends to bring no functional changes. It is just a minor simplification while also making it harder to create a bug with the regulator control. (Registering the devm_action and leaving the handle to the regulator is more fragile than using this new API which does not give user the handle). I am in no way against someone further improving the functionality here (by adding runtime PM) but this someone is not me. Yet, I don't see how this patch prevents runtime PM being implemented? The first thing that needs to be done is removing the devm-action assuming someone did implement power-saving by disabling the regulator(s) at runtime. After this patch is applied, the action removal is automatically a necessity in order to get the handle for regulator control. I know this helper is not preferred by all but it is still safer than the current code which registers the action while allowing the regulator control. Yours -- Matti -- Matti Vaittinen Linux kernel developer at ROHM Semiconductors Oulu Finland ~~ When things go utterly wrong vim users can always type :help! ~~
Hi dee Ho Laurent & All, On 10/21/22 18:29, Neil Armstrong wrote: > Hi, > > On 21/10/2022 17:02, Laurent Pinchart wrote: >> Hi Matti, >> >> On Fri, Oct 21, 2022 at 04:18:01PM +0300, Matti Vaittinen wrote: >>> Simplify using the devm_regulator_get_enable_optional(). Also drop the >>> seemingly unused struct member 'hdmi_supply'. >>> >>> Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> >>> >>> --- >>> v3 => v4: >>> - split meson part to own patch >>> >>> RFCv1 => v2: >>> - Change also sii902x to use devm_regulator_bulk_get_enable() >>> >>> Please note - this is only compile-tested due to the lack of HW. Careful >>> review and testing is _highly_ appreciated. >>> --- >>> drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +++-------------------- >>> 1 file changed, 3 insertions(+), 20 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c >>> b/drivers/gpu/drm/meson/meson_dw_hdmi.c >>> index 5cd2b2ebbbd3..7642f740272b 100644 >>> --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c >>> +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c >>> @@ -140,7 +140,6 @@ struct meson_dw_hdmi { >>> struct reset_control *hdmitx_apb; >>> struct reset_control *hdmitx_ctrl; >>> struct reset_control *hdmitx_phy; >>> - struct regulator *hdmi_supply; >>> u32 irq_stat; >>> struct dw_hdmi *hdmi; >>> struct drm_bridge *bridge; >>> @@ -665,11 +664,6 @@ static void meson_dw_hdmi_init(struct >>> meson_dw_hdmi *meson_dw_hdmi) >>> } >>> -static void meson_disable_regulator(void *data) >>> -{ >>> - regulator_disable(data); >>> -} >>> - >>> static void meson_disable_clk(void *data) >>> { >>> clk_disable_unprepare(data); >>> @@ -723,20 +717,9 @@ static int meson_dw_hdmi_bind(struct device >>> *dev, struct device *master, >>> meson_dw_hdmi->data = match; >>> dw_plat_data = &meson_dw_hdmi->dw_plat_data; >>> - meson_dw_hdmi->hdmi_supply = devm_regulator_get_optional(dev, >>> "hdmi"); >>> - if (IS_ERR(meson_dw_hdmi->hdmi_supply)) { >>> - if (PTR_ERR(meson_dw_hdmi->hdmi_supply) == -EPROBE_DEFER) >>> - return -EPROBE_DEFER; >>> - meson_dw_hdmi->hdmi_supply = NULL; >>> - } else { >>> - ret = regulator_enable(meson_dw_hdmi->hdmi_supply); >>> - if (ret) >>> - return ret; >>> - ret = devm_add_action_or_reset(dev, meson_disable_regulator, >>> - meson_dw_hdmi->hdmi_supply); >>> - if (ret) >>> - return ret; >>> - } >>> + ret = devm_regulator_get_enable_optional(dev, "hdmi"); >>> + if (ret != -ENODEV) >>> + return ret; >> >> As noted in the review of the series that introduced >> devm_regulator_get_enable_optional(), the right thing to do is to >> implement runtime PM in this driver to avoid wasting power. > > While I agree, it's not really the same level of effort as this patch > should be functionally equivalent. While we all agree that power savings gained by runtime PM would be great - I don't think we should stop minor improvements while waiting for that to magically happen ;) I like the saying I first heard from Jonathan Cameron - "Don't let the perfect be an enemy of good". After that being said, should I re-spin this or just drop it? (I am cleaning up my local git from old stuff, and these are about to vanish from my books). Yours, -- Matti -- Matti Vaittinen Linux kernel developer at ROHM Semiconductors Oulu Finland ~~ When things go utterly wrong vim users can always type :help! ~~
On 16/11/2022 13:02, Vaittinen, Matti wrote: > Hi dee Ho Laurent & All, > > On 10/21/22 18:29, Neil Armstrong wrote: >> Hi, >> >> On 21/10/2022 17:02, Laurent Pinchart wrote: >>> Hi Matti, >>> >>> On Fri, Oct 21, 2022 at 04:18:01PM +0300, Matti Vaittinen wrote: >>>> Simplify using the devm_regulator_get_enable_optional(). Also drop the >>>> seemingly unused struct member 'hdmi_supply'. >>>> >>>> Signed-off-by: Matti Vaittinen <mazziesaccount@gmail.com> >>>> >>>> --- >>>> v3 => v4: >>>> - split meson part to own patch >>>> >>>> RFCv1 => v2: >>>> - Change also sii902x to use devm_regulator_bulk_get_enable() >>>> >>>> Please note - this is only compile-tested due to the lack of HW. Careful >>>> review and testing is _highly_ appreciated. >>>> --- >>>> drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +++-------------------- >>>> 1 file changed, 3 insertions(+), 20 deletions(-) >>>> >>>> diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c >>>> b/drivers/gpu/drm/meson/meson_dw_hdmi.c >>>> index 5cd2b2ebbbd3..7642f740272b 100644 >>>> --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c >>>> +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c >>>> @@ -140,7 +140,6 @@ struct meson_dw_hdmi { >>>> struct reset_control *hdmitx_apb; >>>> struct reset_control *hdmitx_ctrl; >>>> struct reset_control *hdmitx_phy; >>>> - struct regulator *hdmi_supply; >>>> u32 irq_stat; >>>> struct dw_hdmi *hdmi; >>>> struct drm_bridge *bridge; >>>> @@ -665,11 +664,6 @@ static void meson_dw_hdmi_init(struct >>>> meson_dw_hdmi *meson_dw_hdmi) >>>> } >>>> -static void meson_disable_regulator(void *data) >>>> -{ >>>> - regulator_disable(data); >>>> -} >>>> - >>>> static void meson_disable_clk(void *data) >>>> { >>>> clk_disable_unprepare(data); >>>> @@ -723,20 +717,9 @@ static int meson_dw_hdmi_bind(struct device >>>> *dev, struct device *master, >>>> meson_dw_hdmi->data = match; >>>> dw_plat_data = &meson_dw_hdmi->dw_plat_data; >>>> - meson_dw_hdmi->hdmi_supply = devm_regulator_get_optional(dev, >>>> "hdmi"); >>>> - if (IS_ERR(meson_dw_hdmi->hdmi_supply)) { >>>> - if (PTR_ERR(meson_dw_hdmi->hdmi_supply) == -EPROBE_DEFER) >>>> - return -EPROBE_DEFER; >>>> - meson_dw_hdmi->hdmi_supply = NULL; >>>> - } else { >>>> - ret = regulator_enable(meson_dw_hdmi->hdmi_supply); >>>> - if (ret) >>>> - return ret; >>>> - ret = devm_add_action_or_reset(dev, meson_disable_regulator, >>>> - meson_dw_hdmi->hdmi_supply); >>>> - if (ret) >>>> - return ret; >>>> - } >>>> + ret = devm_regulator_get_enable_optional(dev, "hdmi"); >>>> + if (ret != -ENODEV) >>>> + return ret; >>> >>> As noted in the review of the series that introduced >>> devm_regulator_get_enable_optional(), the right thing to do is to >>> implement runtime PM in this driver to avoid wasting power. >> >> While I agree, it's not really the same level of effort as this patch >> should be functionally equivalent. > > While we all agree that power savings gained by runtime PM would be > great - I don't think we should stop minor improvements while waiting > for that to magically happen ;) > > I like the saying I first heard from Jonathan Cameron - "Don't let the > perfect be an enemy of good". > > After that being said, should I re-spin this or just drop it? (I am > cleaning up my local git from old stuff, and these are about to vanish > from my books). I'm ok with you, please re-spin it. Neil > > Yours, > -- Matti >
diff --git a/drivers/gpu/drm/meson/meson_dw_hdmi.c b/drivers/gpu/drm/meson/meson_dw_hdmi.c index 5cd2b2ebbbd3..7642f740272b 100644 --- a/drivers/gpu/drm/meson/meson_dw_hdmi.c +++ b/drivers/gpu/drm/meson/meson_dw_hdmi.c @@ -140,7 +140,6 @@ struct meson_dw_hdmi { struct reset_control *hdmitx_apb; struct reset_control *hdmitx_ctrl; struct reset_control *hdmitx_phy; - struct regulator *hdmi_supply; u32 irq_stat; struct dw_hdmi *hdmi; struct drm_bridge *bridge; @@ -665,11 +664,6 @@ static void meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi) } -static void meson_disable_regulator(void *data) -{ - regulator_disable(data); -} - static void meson_disable_clk(void *data) { clk_disable_unprepare(data); @@ -723,20 +717,9 @@ static int meson_dw_hdmi_bind(struct device *dev, struct device *master, meson_dw_hdmi->data = match; dw_plat_data = &meson_dw_hdmi->dw_plat_data; - meson_dw_hdmi->hdmi_supply = devm_regulator_get_optional(dev, "hdmi"); - if (IS_ERR(meson_dw_hdmi->hdmi_supply)) { - if (PTR_ERR(meson_dw_hdmi->hdmi_supply) == -EPROBE_DEFER) - return -EPROBE_DEFER; - meson_dw_hdmi->hdmi_supply = NULL; - } else { - ret = regulator_enable(meson_dw_hdmi->hdmi_supply); - if (ret) - return ret; - ret = devm_add_action_or_reset(dev, meson_disable_regulator, - meson_dw_hdmi->hdmi_supply); - if (ret) - return ret; - } + ret = devm_regulator_get_enable_optional(dev, "hdmi"); + if (ret != -ENODEV) + return ret; meson_dw_hdmi->hdmitx_apb = devm_reset_control_get_exclusive(dev, "hdmitx_apb");