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 7D144C433EF for ; Mon, 28 Feb 2022 08:19:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233998AbiB1ITv (ORCPT ); Mon, 28 Feb 2022 03:19:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233990AbiB1ITs (ORCPT ); Mon, 28 Feb 2022 03:19:48 -0500 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40B384B852; Mon, 28 Feb 2022 00:19:09 -0800 (PST) X-UUID: de632f9d6aa94837ad4ed73fff35d2f7-20220228 X-UUID: de632f9d6aa94837ad4ed73fff35d2f7-20220228 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 202649106; Mon, 28 Feb 2022 16:19:02 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Mon, 28 Feb 2022 16:19:01 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 28 Feb 2022 16:19:00 +0800 Message-ID: Subject: Re: [PATCH v2] usb: host: xhci-mtk: Simplify supplies handling with regulator_bulk From: Chunfeng Yun To: AngeloGioacchino Del Regno CC: , , , , , , , Date: Mon, 28 Feb 2022 16:19:00 +0800 In-Reply-To: <20220214111905.77903-1-angelogioacchino.delregno@collabora.com> References: <20220214111905.77903-1-angelogioacchino.delregno@collabora.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2022-02-14 at 12:19 +0100, AngeloGioacchino Del Regno wrote: > Remove the custom functions xhci_mtk_ldos_{enable,disable}() by > switching to using regulator_bulk to perform the very same thing, > as the regulators are always either both enabled or both disabled. > > Signed-off-by: AngeloGioacchino Del Regno < > angelogioacchino.delregno@collabora.com> > --- > > v2: Change dynamic vregs array to static definition with new > xhci_mtk_vregs_get() > helper as requested by Chunfeng > > drivers/usb/host/xhci-mtk.c | 44 ++++++++++------------------------- > -- > drivers/usb/host/xhci-mtk.h | 5 +++-- > 2 files changed, 14 insertions(+), 35 deletions(-) > > diff --git a/drivers/usb/host/xhci-mtk.c b/drivers/usb/host/xhci- > mtk.c > index e25bad0894cf..b89b4f159a4d 100644 > --- a/drivers/usb/host/xhci-mtk.c > +++ b/drivers/usb/host/xhci-mtk.c > @@ -401,29 +401,14 @@ static int xhci_mtk_clks_get(struct > xhci_hcd_mtk *mtk) > return devm_clk_bulk_get_optional(mtk->dev, BULK_CLKS_NUM, > clks); > } > > -static int xhci_mtk_ldos_enable(struct xhci_hcd_mtk *mtk) > +static int xhci_mtk_vregs_get(struct xhci_hcd_mtk *mtk) > { > - int ret; > + struct regulator_bulk_data *supplies = mtk->supplies; > > - ret = regulator_enable(mtk->vbus); > - if (ret) { > - dev_err(mtk->dev, "failed to enable vbus\n"); > - return ret; > - } > - > - ret = regulator_enable(mtk->vusb33); > - if (ret) { > - dev_err(mtk->dev, "failed to enable vusb33\n"); > - regulator_disable(mtk->vbus); > - return ret; > - } > - return 0; > -} > + supplies[0].supply = "vbus"; > + supplies[1].supply = "vusb33"; > > -static void xhci_mtk_ldos_disable(struct xhci_hcd_mtk *mtk) > -{ > - regulator_disable(mtk->vbus); > - regulator_disable(mtk->vusb33); > + return devm_regulator_bulk_get(mtk->dev, BULK_VREGS_NUM, > supplies); > } > > static void xhci_mtk_quirks(struct device *dev, struct xhci_hcd > *xhci) > @@ -513,17 +498,10 @@ static int xhci_mtk_probe(struct > platform_device *pdev) > return -ENOMEM; > > mtk->dev = dev; > - mtk->vbus = devm_regulator_get(dev, "vbus"); > - if (IS_ERR(mtk->vbus)) { > - dev_err(dev, "fail to get vbus\n"); > - return PTR_ERR(mtk->vbus); > - } > > - mtk->vusb33 = devm_regulator_get(dev, "vusb33"); > - if (IS_ERR(mtk->vusb33)) { > - dev_err(dev, "fail to get vusb33\n"); > - return PTR_ERR(mtk->vusb33); > - } > + ret = xhci_mtk_vregs_get(mtk); > + if (ret) > + return dev_err_probe(dev, ret, "Failed to get > regulators\n"); > > ret = xhci_mtk_clks_get(mtk); > if (ret) > @@ -564,7 +542,7 @@ static int xhci_mtk_probe(struct platform_device > *pdev) > pm_runtime_enable(dev); > pm_runtime_get_sync(dev); > > - ret = xhci_mtk_ldos_enable(mtk); > + ret = regulator_bulk_enable(BULK_VREGS_NUM, mtk->supplies); > if (ret) > goto disable_pm; > > @@ -673,7 +651,7 @@ static int xhci_mtk_probe(struct platform_device > *pdev) > clk_bulk_disable_unprepare(BULK_CLKS_NUM, mtk->clks); > > disable_ldos: > - xhci_mtk_ldos_disable(mtk); > + regulator_bulk_disable(BULK_VREGS_NUM, mtk->supplies); > > disable_pm: > pm_runtime_put_noidle(dev); > @@ -701,7 +679,7 @@ static int xhci_mtk_remove(struct platform_device > *pdev) > usb_put_hcd(hcd); > xhci_mtk_sch_exit(mtk); > clk_bulk_disable_unprepare(BULK_CLKS_NUM, mtk->clks); > - xhci_mtk_ldos_disable(mtk); > + regulator_bulk_disable(BULK_VREGS_NUM, mtk->supplies); > > pm_runtime_disable(dev); > pm_runtime_put_noidle(dev); > diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci- > mtk.h > index 4b1ea89f959a..ffd4b493b4ba 100644 > --- a/drivers/usb/host/xhci-mtk.h > +++ b/drivers/usb/host/xhci-mtk.h > @@ -11,10 +11,12 @@ > > #include > #include > +#include > > #include "xhci.h" > > #define BULK_CLKS_NUM 5 > +#define BULK_VREGS_NUM 2 > > /* support at most 64 ep, use 32 size hash table */ > #define SCH_EP_HASH_BITS 5 > @@ -150,9 +152,8 @@ struct xhci_hcd_mtk { > int num_u3_ports; > int u2p_dis_msk; > int u3p_dis_msk; > - struct regulator *vusb33; > - struct regulator *vbus; > struct clk_bulk_data clks[BULK_CLKS_NUM]; > + struct regulator_bulk_data supplies[BULK_VREGS_NUM]; > unsigned int has_ippc:1; > unsigned int lpm_support:1; > unsigned int u2_lpm_disable:1; Acked-by: Chunfeng Yun Thanks a lot