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 92496ECAAD2 for ; Mon, 29 Aug 2022 14:26:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229753AbiH2O0C (ORCPT ); Mon, 29 Aug 2022 10:26:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51200 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbiH2O0A (ORCPT ); Mon, 29 Aug 2022 10:26:00 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBAB87C1F2 for ; Mon, 29 Aug 2022 07:25:58 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id cu2so16113016ejb.0 for ; Mon, 29 Aug 2022 07:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=l/Yc+Efm+jAH2bHIU6WTgN3herS8kuZyRKDMWpjdJxo=; b=QOHsGZIytKO7SnZQmz6nn/31c4K3mQhuufa491ZPVia94uv2PjPKOGu9DNBgUzACiD dfpEZPYH6sFS55eZlNkoWMB0G84SxSURdQwSMuEDE+xN67trAzrxaEkqQeF6frXk6pIq 57Zhz35/vzQcPodZcB8jsodJe28XCSwy0jrdkkD8X+5qBRRCfMncSV4nE6nYttvm4kcj M12jrdwOiq5tW9VVu1t9FjJBKKw/9VhAwn9YvY8+8tAJPKbxA0ITIowgehApK0NBMHb8 vW8Nbc9rIuhlQgGs5PqgdxHPkjsQ801o6/c+BlAbRSZQBaOkUztLlKMzgLFWFmCBqWzI MQaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=l/Yc+Efm+jAH2bHIU6WTgN3herS8kuZyRKDMWpjdJxo=; b=1DHVmoZZDGtbTgXsvBpgZQqXrJQjo5qYs9Ph6i1wUx3NpU4489kBVesX/SXD5olSG7 egI8xoYuCr5Q7RJP0AbrRMZOErI2VbSf0k4mPZd9v77ZnC/5UrXQxt8YQOMPFOO1fK5D +MJACOB9j29aoHy3YTcQP26sCCcV4q2FNqpDGoDF5jk+ZWG0uq/D4DvH0vUiezs9gFY4 t1WJnpwamSw+K6hPSw5T0lIo5FKrlF9BwY+NRnRJt3rJAAPYWkKD182jX2KNJBPJ/qc0 70nSfJejOyqFud+o5L3O/xyoFIp3PDD2N6JB2DLeK5IfAK/voAyiinb+ZDADXMjNcjM1 yzew== X-Gm-Message-State: ACgBeo3SE+vyeGShxuWDc/pj85JumOIZt2GD4MHv8Mp7e+sFMPGwBZcV Oy1KsVJqsyYLIl3hZlU0QyXC8CCPtBMRGWPceeliSw== X-Google-Smtp-Source: AA6agR5pN0biFCTrJh35y0R2O5ORF7VLoMnMkRM6bASxTgcpp25sbN5t9qeEZmRz3ouyzPqimAX1el7Q5rNHYqHB6BQ= X-Received: by 2002:a17:907:9814:b0:73d:cb9f:c0b8 with SMTP id ji20-20020a170907981400b0073dcb9fc0b8mr14000760ejc.648.1661783145482; Mon, 29 Aug 2022 07:25:45 -0700 (PDT) MIME-Version: 1.0 References: <3aacca7d9a0240d95dc3cf103d114b5c85392e71.1660934107.git.mazziesaccount@gmail.com> In-Reply-To: <3aacca7d9a0240d95dc3cf103d114b5c85392e71.1660934107.git.mazziesaccount@gmail.com> From: Robert Foss Date: Mon, 29 Aug 2022 16:25:34 +0200 Message-ID: Subject: Re: [PATCH v3 03/14] gpu: drm: simplify drivers using devm_regulator_*get_enable*() To: Matti Vaittinen Cc: Matti Vaittinen , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Liam Girdwood , Mark Brown , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Matti, On Fri, 19 Aug 2022 at 21:18, Matti Vaittinen wrote: > > Simplify drivers using managed "regulator get and enable". > > meson: > Use the devm_regulator_get_enable_optional(). Also drop the seemingly > unused struct member 'hdmi_supply'. > > sii902x: > Simplify using devm_regulator_bulk_get_enable() > > Signed-off-by: Matti Vaittinen > > --- > v2 => v3: > No changes > > 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/bridge/sii902x.c | 22 +++------------------- > drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +++-------------------- > 2 files changed, 6 insertions(+), 39 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c > index 7ab38d734ad6..162f9c87eeb2 100644 > --- a/drivers/gpu/drm/bridge/sii902x.c > +++ b/drivers/gpu/drm/bridge/sii902x.c > @@ -171,7 +171,6 @@ struct sii902x { > struct drm_connector connector; > struct gpio_desc *reset_gpio; > struct i2c_mux_core *i2cmux; > - struct regulator_bulk_data supplies[2]; > bool sink_is_hdmi; > /* > * Mutex protects audio and video functions from interfering > @@ -1072,6 +1071,7 @@ static int sii902x_probe(struct i2c_client *client, > struct device *dev = &client->dev; > struct device_node *endpoint; > struct sii902x *sii902x; > + static const char * const supplies[] = {"iovcc", "cvcc12"}; > int ret; > > ret = i2c_check_functionality(client->adapter, > @@ -1122,27 +1122,13 @@ static int sii902x_probe(struct i2c_client *client, > > mutex_init(&sii902x->mutex); > > - sii902x->supplies[0].supply = "iovcc"; > - sii902x->supplies[1].supply = "cvcc12"; > - ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > - if (ret < 0) > - return ret; > - > - ret = regulator_bulk_enable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > + ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(supplies), supplies); > if (ret < 0) { > dev_err_probe(dev, ret, "Failed to enable supplies"); > return ret; > } > > - ret = sii902x_init(sii902x); > - if (ret < 0) { > - regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > - } > - > - return ret; > + return sii902x_init(sii902x); > } > > static int sii902x_remove(struct i2c_client *client) > @@ -1152,8 +1138,6 @@ static int sii902x_remove(struct i2c_client *client) > > i2c_mux_del_adapters(sii902x->i2cmux); > drm_bridge_remove(&sii902x->bridge); > - regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > > return 0; > } Ideally this patch would be split into two parts here, due to maintainership boundaries. For the sii902x part, please add my r-b. Reviewed-by: Robert Foss > 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"); > -- > 2.37.1 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 29778ECAAD5 for ; Mon, 29 Aug 2022 14:25:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 474A410F1DF; Mon, 29 Aug 2022 14:25:52 +0000 (UTC) Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by gabe.freedesktop.org (Postfix) with ESMTPS id 15C8410F1DF for ; Mon, 29 Aug 2022 14:25:47 +0000 (UTC) Received: by mail-ej1-x633.google.com with SMTP id w19so16039898ejc.7 for ; Mon, 29 Aug 2022 07:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=l/Yc+Efm+jAH2bHIU6WTgN3herS8kuZyRKDMWpjdJxo=; b=QOHsGZIytKO7SnZQmz6nn/31c4K3mQhuufa491ZPVia94uv2PjPKOGu9DNBgUzACiD dfpEZPYH6sFS55eZlNkoWMB0G84SxSURdQwSMuEDE+xN67trAzrxaEkqQeF6frXk6pIq 57Zhz35/vzQcPodZcB8jsodJe28XCSwy0jrdkkD8X+5qBRRCfMncSV4nE6nYttvm4kcj M12jrdwOiq5tW9VVu1t9FjJBKKw/9VhAwn9YvY8+8tAJPKbxA0ITIowgehApK0NBMHb8 vW8Nbc9rIuhlQgGs5PqgdxHPkjsQ801o6/c+BlAbRSZQBaOkUztLlKMzgLFWFmCBqWzI MQaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=l/Yc+Efm+jAH2bHIU6WTgN3herS8kuZyRKDMWpjdJxo=; b=bO4yqrBPRKLc2SCjWJV3fes/pQnHswQzQZT3rWVL0uSRRc5IOxgZRK6f2woj/qZWtQ ZIbhV19a1HlPZiGfBav6zfCN2SpGPWMKtpKjmCmnjNY3XnCm2ggDwjKAv5hpEL8uWWG2 HkFQ9dnMoE8lr4QV+7/1LwyGMDCLxjYbWEgZdQUemuBFZF0ximZX/WRjB0eU5qAFJWQj 9TdzV/KKcEmDuetFc9VMwmoS/CCis0HrD5ATfqbRyqouiRw+4N8DCKyNQA0ezZavcBB7 68bXrLM/PqP8ysW6N/iubUBubvF3mG0FaUYXd9Z4xO+JpPOybahES3i+xzQOCgw4GsiR 6mKA== X-Gm-Message-State: ACgBeo3/7W8AMQT1jDBZ9+8PKml1KtOYixgrjdIeIQp9goWsFUJJ1QkY UmxmDJJe0xzHysDDC+HWhteNc3j52ys52LC84X0+tggHPlCUwA== X-Google-Smtp-Source: AA6agR5pN0biFCTrJh35y0R2O5ORF7VLoMnMkRM6bASxTgcpp25sbN5t9qeEZmRz3ouyzPqimAX1el7Q5rNHYqHB6BQ= X-Received: by 2002:a17:907:9814:b0:73d:cb9f:c0b8 with SMTP id ji20-20020a170907981400b0073dcb9fc0b8mr14000760ejc.648.1661783145482; Mon, 29 Aug 2022 07:25:45 -0700 (PDT) MIME-Version: 1.0 References: <3aacca7d9a0240d95dc3cf103d114b5c85392e71.1660934107.git.mazziesaccount@gmail.com> In-Reply-To: <3aacca7d9a0240d95dc3cf103d114b5c85392e71.1660934107.git.mazziesaccount@gmail.com> From: Robert Foss Date: Mon, 29 Aug 2022 16:25:34 +0200 Message-ID: Subject: Re: [PATCH v3 03/14] gpu: drm: simplify drivers using devm_regulator_*get_enable*() To: Matti Vaittinen Content-Type: text/plain; charset="UTF-8" X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jonas Karlman , David Airlie , Kevin Hilman , dri-devel@lists.freedesktop.org, Neil Armstrong , Matti Vaittinen , Liam Girdwood , Jernej Skrabec , linux-kernel@vger.kernel.org, Martin Blumenstingl , Mark Brown , Laurent Pinchart , Andrzej Hajda , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Matti, On Fri, 19 Aug 2022 at 21:18, Matti Vaittinen wrote: > > Simplify drivers using managed "regulator get and enable". > > meson: > Use the devm_regulator_get_enable_optional(). Also drop the seemingly > unused struct member 'hdmi_supply'. > > sii902x: > Simplify using devm_regulator_bulk_get_enable() > > Signed-off-by: Matti Vaittinen > > --- > v2 => v3: > No changes > > 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/bridge/sii902x.c | 22 +++------------------- > drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +++-------------------- > 2 files changed, 6 insertions(+), 39 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c > index 7ab38d734ad6..162f9c87eeb2 100644 > --- a/drivers/gpu/drm/bridge/sii902x.c > +++ b/drivers/gpu/drm/bridge/sii902x.c > @@ -171,7 +171,6 @@ struct sii902x { > struct drm_connector connector; > struct gpio_desc *reset_gpio; > struct i2c_mux_core *i2cmux; > - struct regulator_bulk_data supplies[2]; > bool sink_is_hdmi; > /* > * Mutex protects audio and video functions from interfering > @@ -1072,6 +1071,7 @@ static int sii902x_probe(struct i2c_client *client, > struct device *dev = &client->dev; > struct device_node *endpoint; > struct sii902x *sii902x; > + static const char * const supplies[] = {"iovcc", "cvcc12"}; > int ret; > > ret = i2c_check_functionality(client->adapter, > @@ -1122,27 +1122,13 @@ static int sii902x_probe(struct i2c_client *client, > > mutex_init(&sii902x->mutex); > > - sii902x->supplies[0].supply = "iovcc"; > - sii902x->supplies[1].supply = "cvcc12"; > - ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > - if (ret < 0) > - return ret; > - > - ret = regulator_bulk_enable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > + ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(supplies), supplies); > if (ret < 0) { > dev_err_probe(dev, ret, "Failed to enable supplies"); > return ret; > } > > - ret = sii902x_init(sii902x); > - if (ret < 0) { > - regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > - } > - > - return ret; > + return sii902x_init(sii902x); > } > > static int sii902x_remove(struct i2c_client *client) > @@ -1152,8 +1138,6 @@ static int sii902x_remove(struct i2c_client *client) > > i2c_mux_del_adapters(sii902x->i2cmux); > drm_bridge_remove(&sii902x->bridge); > - regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > > return 0; > } Ideally this patch would be split into two parts here, due to maintainership boundaries. For the sii902x part, please add my r-b. Reviewed-by: Robert Foss > 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"); > -- > 2.37.1 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A5562ECAAD5 for ; Mon, 29 Aug 2022 14:26:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=eMTN6TNGAfuAeMuz78HOJzKEexyUX1zv+8lCDsqwl78=; b=uA6CSPiI/VN3j0 25hE2XeERlwGjK+pWYL8JHiXKpTyvAQLYon2iV6TEW/yyzW4gAG96YWHx45bBxu8Iv35ZcRC6NzZq B1W0lu7nVad5KpVRc7EQHiFAoj2CFa8E0+q4wDy7JXGofIoBHvVxCzaYPCZJfozuy92tIVprpaQg6 24S3Z/v2NhlSOSpr/JAcY27UX4+zzX86pcjgkAWG1jEytT+EScV6JWHxxN2rs6I0jMShc5OFXytkR kCPMKy0QI0So5OjLzejLLpbPRtL/p4cY4c3IceOuZ9E5+donWCetOIZpdUELNLE0lr9bjMxU3z9iL At4TSvusNfDetHkjKIxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSfiF-00B55V-7s; Mon, 29 Aug 2022 14:26:03 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSfi1-00B51S-DZ for linux-amlogic@lists.infradead.org; Mon, 29 Aug 2022 14:25:51 +0000 Received: by mail-ej1-x629.google.com with SMTP id gb36so16019018ejc.10 for ; Mon, 29 Aug 2022 07:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=l/Yc+Efm+jAH2bHIU6WTgN3herS8kuZyRKDMWpjdJxo=; b=QOHsGZIytKO7SnZQmz6nn/31c4K3mQhuufa491ZPVia94uv2PjPKOGu9DNBgUzACiD dfpEZPYH6sFS55eZlNkoWMB0G84SxSURdQwSMuEDE+xN67trAzrxaEkqQeF6frXk6pIq 57Zhz35/vzQcPodZcB8jsodJe28XCSwy0jrdkkD8X+5qBRRCfMncSV4nE6nYttvm4kcj M12jrdwOiq5tW9VVu1t9FjJBKKw/9VhAwn9YvY8+8tAJPKbxA0ITIowgehApK0NBMHb8 vW8Nbc9rIuhlQgGs5PqgdxHPkjsQ801o6/c+BlAbRSZQBaOkUztLlKMzgLFWFmCBqWzI MQaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=l/Yc+Efm+jAH2bHIU6WTgN3herS8kuZyRKDMWpjdJxo=; b=fgBYKGVE15NyctWD2ITimDePw0eoGrjZBPOQI+DqkMFpNS1hmAeUQU+uO96KIBs9O7 TUX0XRvP2QnppHqOkDpVqkB3XczCwYgnG6njcP01YLdGjH9+ithFg5UF2VcIqFyOjmeb We0kByIfccziC8MdKn+8VThn4Lk+m4zeR15cNtjJWSs0Zik8zPvVh6DKQrWhkKocTIt2 eQYiGoOyKf01PL0BW6SpJ5Tds8ZA+1/x40lnSFgrrrMl6wHgX8QQik+lDETI7371VLbd GS3aFk0icOyY7HsqWZ/5KYJZRZZKzsKgrkOKnTsML0R/QW11PvTDju4k/rB88TjDm6g+ ZQvg== X-Gm-Message-State: ACgBeo34oldTS7Rc+Na2C+MyIKHPRXXwxcROQRsVRHbCTh3HEy4e023a Bzn810MpbXL0vQuVyryOLga7bye3/ItPJqix5GvZWQ== X-Google-Smtp-Source: AA6agR5pN0biFCTrJh35y0R2O5ORF7VLoMnMkRM6bASxTgcpp25sbN5t9qeEZmRz3ouyzPqimAX1el7Q5rNHYqHB6BQ= X-Received: by 2002:a17:907:9814:b0:73d:cb9f:c0b8 with SMTP id ji20-20020a170907981400b0073dcb9fc0b8mr14000760ejc.648.1661783145482; Mon, 29 Aug 2022 07:25:45 -0700 (PDT) MIME-Version: 1.0 References: <3aacca7d9a0240d95dc3cf103d114b5c85392e71.1660934107.git.mazziesaccount@gmail.com> In-Reply-To: <3aacca7d9a0240d95dc3cf103d114b5c85392e71.1660934107.git.mazziesaccount@gmail.com> From: Robert Foss Date: Mon, 29 Aug 2022 16:25:34 +0200 Message-ID: Subject: Re: [PATCH v3 03/14] gpu: drm: simplify drivers using devm_regulator_*get_enable*() To: Matti Vaittinen Cc: Matti Vaittinen , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Liam Girdwood , Mark Brown , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220829_072549_470224_487D1AE2 X-CRM114-Status: GOOD ( 22.56 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org Hi Matti, On Fri, 19 Aug 2022 at 21:18, Matti Vaittinen wrote: > > Simplify drivers using managed "regulator get and enable". > > meson: > Use the devm_regulator_get_enable_optional(). Also drop the seemingly > unused struct member 'hdmi_supply'. > > sii902x: > Simplify using devm_regulator_bulk_get_enable() > > Signed-off-by: Matti Vaittinen > > --- > v2 => v3: > No changes > > 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/bridge/sii902x.c | 22 +++------------------- > drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +++-------------------- > 2 files changed, 6 insertions(+), 39 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c > index 7ab38d734ad6..162f9c87eeb2 100644 > --- a/drivers/gpu/drm/bridge/sii902x.c > +++ b/drivers/gpu/drm/bridge/sii902x.c > @@ -171,7 +171,6 @@ struct sii902x { > struct drm_connector connector; > struct gpio_desc *reset_gpio; > struct i2c_mux_core *i2cmux; > - struct regulator_bulk_data supplies[2]; > bool sink_is_hdmi; > /* > * Mutex protects audio and video functions from interfering > @@ -1072,6 +1071,7 @@ static int sii902x_probe(struct i2c_client *client, > struct device *dev = &client->dev; > struct device_node *endpoint; > struct sii902x *sii902x; > + static const char * const supplies[] = {"iovcc", "cvcc12"}; > int ret; > > ret = i2c_check_functionality(client->adapter, > @@ -1122,27 +1122,13 @@ static int sii902x_probe(struct i2c_client *client, > > mutex_init(&sii902x->mutex); > > - sii902x->supplies[0].supply = "iovcc"; > - sii902x->supplies[1].supply = "cvcc12"; > - ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > - if (ret < 0) > - return ret; > - > - ret = regulator_bulk_enable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > + ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(supplies), supplies); > if (ret < 0) { > dev_err_probe(dev, ret, "Failed to enable supplies"); > return ret; > } > > - ret = sii902x_init(sii902x); > - if (ret < 0) { > - regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > - } > - > - return ret; > + return sii902x_init(sii902x); > } > > static int sii902x_remove(struct i2c_client *client) > @@ -1152,8 +1138,6 @@ static int sii902x_remove(struct i2c_client *client) > > i2c_mux_del_adapters(sii902x->i2cmux); > drm_bridge_remove(&sii902x->bridge); > - regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > > return 0; > } Ideally this patch would be split into two parts here, due to maintainership boundaries. For the sii902x part, please add my r-b. Reviewed-by: Robert Foss > 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"); > -- > 2.37.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8F9EDECAAD5 for ; Mon, 29 Aug 2022 14:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZVTvZDod6qpaXUbGrTqrtp9ZrrUZIi7xCcwJ2T+QrLM=; b=I2y9PRaV2nmWTg Ei5EcJs/Vnp2pDfmRsf9JCcEEqL1G+jzaoQmictOicGxfkJq7x6xaEaCZOGZz1JKHeY0YsBbf4eHa x7dAK0otQDu8NzQe56IFRrgsRT2SwkaFwwqhEWU0O7aeYumvNcFq3CFkDDd5gnfJ65PHJzITuYQwD g/mZ7faRRbjDfsZUzz7CNmzKnHH17206d10HiJypLAhLn7l+CBrXi0eKCAAs5moVFDoqsZZWOyoKb Z6KddoJ/cDYzHgdPewByDGWgI4Ql7iG2uqlUQq/sjKJSvXNrweg1Jc8UEKk5B9uRItjg0rn9gkTbc lXmMft6NFdZ9jPELQLDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSfi4-00B52s-9r; Mon, 29 Aug 2022 14:25:52 +0000 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oSfi0-00B51R-Td for linux-arm-kernel@lists.infradead.org; Mon, 29 Aug 2022 14:25:50 +0000 Received: by mail-ej1-x636.google.com with SMTP id og21so16064207ejc.2 for ; Mon, 29 Aug 2022 07:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc; bh=l/Yc+Efm+jAH2bHIU6WTgN3herS8kuZyRKDMWpjdJxo=; b=QOHsGZIytKO7SnZQmz6nn/31c4K3mQhuufa491ZPVia94uv2PjPKOGu9DNBgUzACiD dfpEZPYH6sFS55eZlNkoWMB0G84SxSURdQwSMuEDE+xN67trAzrxaEkqQeF6frXk6pIq 57Zhz35/vzQcPodZcB8jsodJe28XCSwy0jrdkkD8X+5qBRRCfMncSV4nE6nYttvm4kcj M12jrdwOiq5tW9VVu1t9FjJBKKw/9VhAwn9YvY8+8tAJPKbxA0ITIowgehApK0NBMHb8 vW8Nbc9rIuhlQgGs5PqgdxHPkjsQ801o6/c+BlAbRSZQBaOkUztLlKMzgLFWFmCBqWzI MQaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc; bh=l/Yc+Efm+jAH2bHIU6WTgN3herS8kuZyRKDMWpjdJxo=; b=5+fJluYb2G10gDXXpCy41E58drCVpdw7OXtXzl5WjaOA0E7WkznEljWZHXfBzEAZpI GffJqMwbJ7ZKc95ho0P6ySQ7iYUmWCGN8RY/vuEihqH97UQLXbmxcjczJyVtGqm2TCJe SpwxYEGCibc0V7MHLwh29e4ASnhaHz1Cje4iSIHFTtmZmZF4p7mdOrpPX93HCFZiOnvg wut7vWUGfrWvfHVD0QUm0c1I9w1JEUOYMD0MoqEaUaPkbaAPPvbX4O6FrFjlbwM1Bqr/ 6fnL5O2m1Obir5vDjxxA6wQU7e+XHE9RsZttkF8OHRuVWsBnnkwlILeYPLRdjF23thsX B9fg== X-Gm-Message-State: ACgBeo0I0YsYZS5MXylFYCjZYgxCqTZRmd/7Fqd4PNKiQHOgLQE0xfYa PyO+nO5QFHuPh+3C8EsRWv6ahLtNyKV/ojnw7cRHkw== X-Google-Smtp-Source: AA6agR5pN0biFCTrJh35y0R2O5ORF7VLoMnMkRM6bASxTgcpp25sbN5t9qeEZmRz3ouyzPqimAX1el7Q5rNHYqHB6BQ= X-Received: by 2002:a17:907:9814:b0:73d:cb9f:c0b8 with SMTP id ji20-20020a170907981400b0073dcb9fc0b8mr14000760ejc.648.1661783145482; Mon, 29 Aug 2022 07:25:45 -0700 (PDT) MIME-Version: 1.0 References: <3aacca7d9a0240d95dc3cf103d114b5c85392e71.1660934107.git.mazziesaccount@gmail.com> In-Reply-To: <3aacca7d9a0240d95dc3cf103d114b5c85392e71.1660934107.git.mazziesaccount@gmail.com> From: Robert Foss Date: Mon, 29 Aug 2022 16:25:34 +0200 Message-ID: Subject: Re: [PATCH v3 03/14] gpu: drm: simplify drivers using devm_regulator_*get_enable*() To: Matti Vaittinen Cc: Matti Vaittinen , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Kevin Hilman , Jerome Brunet , Martin Blumenstingl , Liam Girdwood , Mark Brown , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220829_072548_977604_06D8063F X-CRM114-Status: GOOD ( 24.05 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Matti, On Fri, 19 Aug 2022 at 21:18, Matti Vaittinen wrote: > > Simplify drivers using managed "regulator get and enable". > > meson: > Use the devm_regulator_get_enable_optional(). Also drop the seemingly > unused struct member 'hdmi_supply'. > > sii902x: > Simplify using devm_regulator_bulk_get_enable() > > Signed-off-by: Matti Vaittinen > > --- > v2 => v3: > No changes > > 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/bridge/sii902x.c | 22 +++------------------- > drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +++-------------------- > 2 files changed, 6 insertions(+), 39 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/sii902x.c b/drivers/gpu/drm/bridge/sii902x.c > index 7ab38d734ad6..162f9c87eeb2 100644 > --- a/drivers/gpu/drm/bridge/sii902x.c > +++ b/drivers/gpu/drm/bridge/sii902x.c > @@ -171,7 +171,6 @@ struct sii902x { > struct drm_connector connector; > struct gpio_desc *reset_gpio; > struct i2c_mux_core *i2cmux; > - struct regulator_bulk_data supplies[2]; > bool sink_is_hdmi; > /* > * Mutex protects audio and video functions from interfering > @@ -1072,6 +1071,7 @@ static int sii902x_probe(struct i2c_client *client, > struct device *dev = &client->dev; > struct device_node *endpoint; > struct sii902x *sii902x; > + static const char * const supplies[] = {"iovcc", "cvcc12"}; > int ret; > > ret = i2c_check_functionality(client->adapter, > @@ -1122,27 +1122,13 @@ static int sii902x_probe(struct i2c_client *client, > > mutex_init(&sii902x->mutex); > > - sii902x->supplies[0].supply = "iovcc"; > - sii902x->supplies[1].supply = "cvcc12"; > - ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > - if (ret < 0) > - return ret; > - > - ret = regulator_bulk_enable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > + ret = devm_regulator_bulk_get_enable(dev, ARRAY_SIZE(supplies), supplies); > if (ret < 0) { > dev_err_probe(dev, ret, "Failed to enable supplies"); > return ret; > } > > - ret = sii902x_init(sii902x); > - if (ret < 0) { > - regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > - } > - > - return ret; > + return sii902x_init(sii902x); > } > > static int sii902x_remove(struct i2c_client *client) > @@ -1152,8 +1138,6 @@ static int sii902x_remove(struct i2c_client *client) > > i2c_mux_del_adapters(sii902x->i2cmux); > drm_bridge_remove(&sii902x->bridge); > - regulator_bulk_disable(ARRAY_SIZE(sii902x->supplies), > - sii902x->supplies); > > return 0; > } Ideally this patch would be split into two parts here, due to maintainership boundaries. For the sii902x part, please add my r-b. Reviewed-by: Robert Foss > 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"); > -- > 2.37.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel