All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Zhu <hongxing.zhu@nxp.com>
To: l.stach@pengutronix.de, bhelgaas@google.com, broonie@kernel.org,
	lorenzo.pieralisi@arm.com, jingoohan1@gmail.com,
	festevam@gmail.com
Cc: hongxing.zhu@nxp.com, linux-pci@vger.kernel.org,
	linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, kernel@pengutronix.de
Subject: [PATCH v6 5/8] PCI: imx6: Refine the regulator usage
Date: Tue,  8 Feb 2022 11:25:32 +0800	[thread overview]
Message-ID: <1644290735-3797-6-git-send-email-hongxing.zhu@nxp.com> (raw)
In-Reply-To: <1644290735-3797-1-git-send-email-hongxing.zhu@nxp.com>

The driver should undo any enables it did itself. The regulator disable
shouldn't be basing decisions on regulator_is_enabled().

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
---
 drivers/pci/controller/dwc/pci-imx6.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 0aca762d88a3..e165ad00989c 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -369,8 +369,6 @@ static int imx6_pcie_attach_pd(struct device *dev)
 
 static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
 {
-	struct device *dev = imx6_pcie->pci->dev;
-
 	switch (imx6_pcie->drvdata->variant) {
 	case IMX7D:
 	case IMX8MQ:
@@ -400,14 +398,6 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
 				   IMX6Q_GPR1_PCIE_REF_CLK_EN, 0 << 16);
 		break;
 	}
-
-	if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) {
-		int ret = regulator_disable(imx6_pcie->vpcie);
-
-		if (ret)
-			dev_err(dev, "failed to disable vpcie regulator: %d\n",
-				ret);
-	}
 }
 
 static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie)
@@ -583,7 +573,7 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
 	struct device *dev = pci->dev;
 	int ret, err;
 
-	if (imx6_pcie->vpcie && !regulator_is_enabled(imx6_pcie->vpcie)) {
+	if (imx6_pcie->vpcie) {
 		ret = regulator_enable(imx6_pcie->vpcie);
 		if (ret) {
 			dev_err(dev, "failed to enable vpcie regulator: %d\n",
@@ -656,7 +646,7 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
 	return 0;
 
 err_clks:
-	if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) {
+	if (imx6_pcie->vpcie) {
 		ret = regulator_disable(imx6_pcie->vpcie);
 		if (ret)
 			dev_err(dev, "failed to disable vpcie regulator: %d\n",
-- 
2.25.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Richard Zhu <hongxing.zhu@nxp.com>
To: l.stach@pengutronix.de, bhelgaas@google.com, broonie@kernel.org,
	lorenzo.pieralisi@arm.com, jingoohan1@gmail.com,
	festevam@gmail.com
Cc: hongxing.zhu@nxp.com, linux-pci@vger.kernel.org,
	linux-imx@nxp.com, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, kernel@pengutronix.de
Subject: [PATCH v6 5/8] PCI: imx6: Refine the regulator usage
Date: Tue,  8 Feb 2022 11:25:32 +0800	[thread overview]
Message-ID: <1644290735-3797-6-git-send-email-hongxing.zhu@nxp.com> (raw)
In-Reply-To: <1644290735-3797-1-git-send-email-hongxing.zhu@nxp.com>

The driver should undo any enables it did itself. The regulator disable
shouldn't be basing decisions on regulator_is_enabled().

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
---
 drivers/pci/controller/dwc/pci-imx6.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 0aca762d88a3..e165ad00989c 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -369,8 +369,6 @@ static int imx6_pcie_attach_pd(struct device *dev)
 
 static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
 {
-	struct device *dev = imx6_pcie->pci->dev;
-
 	switch (imx6_pcie->drvdata->variant) {
 	case IMX7D:
 	case IMX8MQ:
@@ -400,14 +398,6 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
 				   IMX6Q_GPR1_PCIE_REF_CLK_EN, 0 << 16);
 		break;
 	}
-
-	if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) {
-		int ret = regulator_disable(imx6_pcie->vpcie);
-
-		if (ret)
-			dev_err(dev, "failed to disable vpcie regulator: %d\n",
-				ret);
-	}
 }
 
 static unsigned int imx6_pcie_grp_offset(const struct imx6_pcie *imx6_pcie)
@@ -583,7 +573,7 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
 	struct device *dev = pci->dev;
 	int ret, err;
 
-	if (imx6_pcie->vpcie && !regulator_is_enabled(imx6_pcie->vpcie)) {
+	if (imx6_pcie->vpcie) {
 		ret = regulator_enable(imx6_pcie->vpcie);
 		if (ret) {
 			dev_err(dev, "failed to enable vpcie regulator: %d\n",
@@ -656,7 +646,7 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
 	return 0;
 
 err_clks:
-	if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) {
+	if (imx6_pcie->vpcie) {
 		ret = regulator_disable(imx6_pcie->vpcie);
 		if (ret)
 			dev_err(dev, "failed to disable vpcie regulator: %d\n",
-- 
2.25.1


  parent reply	other threads:[~2022-02-08  3:58 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-08  3:25 [PATCH v6 0/8] PCI: imx6: refine codes and add compliance tests mode support Richard Zhu
2022-02-08  3:25 ` Richard Zhu
2022-02-08  3:25 ` [PATCH v6 1/8] PCI: imx6: Encapsulate the clock enable into one standalone function Richard Zhu
2022-02-08  3:25   ` Richard Zhu
2022-02-08  3:25 ` [PATCH v6 2/8] PCI: imx6: Add the error propagation from host_init Richard Zhu
2022-02-08  3:25   ` Richard Zhu
2022-02-08  3:25 ` [PATCH v6 3/8] PCI: imx6: Move imx6_pcie_clk_disable() earlier Richard Zhu
2022-02-08  3:25   ` Richard Zhu
2022-02-11 16:30   ` Francesco Dolcini
2022-02-11 16:30     ` Francesco Dolcini
2022-02-14  3:25     ` Hongxing Zhu
2022-02-14  3:25       ` Hongxing Zhu
2022-02-08  3:25 ` [PATCH v6 4/8] PCI: imx6: Disable imx6qdl pcie ref clk Richard Zhu
2022-02-08  3:25   ` Richard Zhu
2022-02-08  3:25 ` Richard Zhu [this message]
2022-02-08  3:25   ` [PATCH v6 5/8] PCI: imx6: Refine the regulator usage Richard Zhu
2022-02-11 16:27   ` Francesco Dolcini
2022-02-11 16:27     ` Francesco Dolcini
2022-02-14  3:07     ` Hongxing Zhu
2022-02-14  3:07       ` Hongxing Zhu
2022-02-14  4:52       ` Hongxing Zhu
2022-02-14  4:52         ` Hongxing Zhu
2022-02-14  9:08         ` Francesco Dolcini
2022-02-14  9:08           ` Francesco Dolcini
2022-02-08  3:25 ` [PATCH v6 6/8] PCI: dwc: Add dw_pcie_host_ops.host_exit() callback Richard Zhu
2022-02-08  3:25   ` Richard Zhu
2022-02-08  3:25 ` [PATCH v6 7/8] PCI: imx6: Disable enabled clocks and regulators after link is down Richard Zhu
2022-02-08  3:25   ` Richard Zhu
2022-02-08 10:09   ` Fabio Estevam
2022-02-08 10:09     ` Fabio Estevam
2022-02-09  1:56     ` Hongxing Zhu
2022-02-09  1:56       ` Hongxing Zhu
2022-02-09  2:01       ` Fabio Estevam
2022-02-09  2:01         ` Fabio Estevam
2022-02-09  3:32         ` Hongxing Zhu
2022-02-09  3:32           ` Hongxing Zhu
2022-02-08  3:25 ` [PATCH v6 8/8] PCI: imx6: Add the compliance tests mode support Richard Zhu
2022-02-08  3:25   ` Richard Zhu

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=1644290735-3797-6-git-send-email-hongxing.zhu@nxp.com \
    --to=hongxing.zhu@nxp.com \
    --cc=bhelgaas@google.com \
    --cc=broonie@kernel.org \
    --cc=festevam@gmail.com \
    --cc=jingoohan1@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=l.stach@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    /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: link
Be 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.