From: Chen-Yu Tsai <wenst@chromium.org>
To: "Matthias Brugger" <matthias.bgg@gmail.com>,
"AngeloGioacchino Del Regno"
<angelogioacchino.delregno@collabora.com>,
"Ryder Lee" <ryder.lee@mediatek.com>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kwilczynski@kernel.org>,
"Manivannan Sadhasivam" <mani@kernel.org>,
"Rob Herring" <robh@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>
Cc: Chen-Yu Tsai <wenst@chromium.org>,
Bartosz Golaszewski <brgl@bgdev.pl>,
linux-pci@vger.kernel.org, linux-mediatek@lists.infradead.org,
linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Subject: [PATCH v6 4/7] PCI: mediatek-gen3: Add error path for resume driver callbacks
Date: Tue, 24 Mar 2026 13:19:56 +0800 [thread overview]
Message-ID: <20260324052002.4072430-5-wenst@chromium.org> (raw)
In-Reply-To: <20260324052002.4072430-1-wenst@chromium.org>
The resume callback currently does teardown in the conditional block
directly. This is going to get ugly when the pwrctrl calls are added.
Move the teardown to a proper error cleanup path.
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Reviewed-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Reviewed-by: Manivannan Sadhasivam <mani@kernel.org>
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
---
drivers/pci/controller/pcie-mediatek-gen3.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/controller/pcie-mediatek-gen3.c
index 1b6290f2c360..22a16e4ebc76 100644
--- a/drivers/pci/controller/pcie-mediatek-gen3.c
+++ b/drivers/pci/controller/pcie-mediatek-gen3.c
@@ -1304,14 +1304,16 @@ static int mtk_pcie_resume_noirq(struct device *dev)
return err;
err = mtk_pcie_startup_port(pcie);
- if (err) {
- mtk_pcie_power_down(pcie);
- return err;
- }
+ if (err)
+ goto err_power_down;
mtk_pcie_irq_restore(pcie);
return 0;
+
+err_power_down:
+ mtk_pcie_power_down(pcie);
+ return err;
}
static const struct dev_pm_ops mtk_pcie_pm_ops = {
--
2.53.0.983.g0bb29b3bc5-goog
next prev parent reply other threads:[~2026-03-24 5:20 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-24 5:19 [PATCH v6 0/7] PCI: mediatek-gen3: add power control support Chen-Yu Tsai
2026-03-24 5:19 ` [PATCH v6 1/7] PCI: mediatek-gen3: Clean up mtk_pcie_parse_port() with dev_err_probe() Chen-Yu Tsai
2026-03-24 5:19 ` [PATCH v6 2/7] PCI: mediatek-gen3: Move mtk_pcie_setup_irq() out of mtk_pcie_setup() Chen-Yu Tsai
2026-03-24 5:19 ` [PATCH v6 3/7] PCI: mediatek-gen3: Move controller setup steps before PERST# control Chen-Yu Tsai
2026-03-24 5:19 ` Chen-Yu Tsai [this message]
2026-03-24 5:19 ` [PATCH v6 5/7] PCI: mediatek-gen3: Split out device power helpers Chen-Yu Tsai
2026-03-24 8:55 ` Chen-Yu Tsai
2026-03-24 10:55 ` Manivannan Sadhasivam
2026-03-24 5:19 ` [PATCH v6 6/7] PCI: mediatek-gen3: Disable device if further setup fails Chen-Yu Tsai
2026-03-24 5:19 ` [PATCH v6 7/7] PCI: mediatek-gen3: Integrate new pwrctrl API Chen-Yu Tsai
2026-03-24 7:44 ` [PATCH v6 0/7] PCI: mediatek-gen3: add power control support Manivannan Sadhasivam
2026-03-24 7:52 ` Chen-Yu Tsai
2026-03-24 8:01 ` Manivannan Sadhasivam
2026-03-24 8:26 ` Chen-Yu Tsai
2026-03-24 11:22 ` Manivannan Sadhasivam
2026-03-24 7:49 ` Manivannan Sadhasivam
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=20260324052002.4072430-5-wenst@chromium.org \
--to=wenst@chromium.org \
--cc=angelogioacchino.delregno@collabora.com \
--cc=bartosz.golaszewski@oss.qualcomm.com \
--cc=bhelgaas@google.com \
--cc=brgl@bgdev.pl \
--cc=kwilczynski@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=lpieralisi@kernel.org \
--cc=mani@kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=robh@kernel.org \
--cc=ryder.lee@mediatek.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox