The following commit has been merged into the irq/drivers branch of tip:
Commit-ID: 7de11369ef3037feb8365a3b5e8c433652f5fdeb
Gitweb: https://git.kernel.org/tip/7de11369ef3037feb8365a3b5e8c433652f5fdeb
Author: Fabrizio Castro <fabrizio.castro.jz@xxxxxxxxxxx>
AuthorDate: Wed, 12 Feb 2025 18:20:31
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitterDate: Tue, 18 Feb 2025 09:03:52 +01:00
irqchip/renesas-rzg2l: Use devm_pm_runtime_enable()
Simplify rzg2l_irqc_common_init() by using devm_pm_runtime_enable().
Signed-off-by: Fabrizio Castro <fabrizio.castro.jz@xxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Link: https://lore.kernel.org/all/20250212182034.366167-4-fabrizio.castro.jz@xxxxxxxxxxx
---
drivers/irqchip/irq-renesas-rzg2l.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-renesas-rzg2l.c
index a29c404..c024023 100644
--- a/drivers/irqchip/irq-renesas-rzg2l.c
+++ b/drivers/irqchip/irq-renesas-rzg2l.c
@@ -568,11 +568,16 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node *
return PTR_ERR(resetn);
}
- pm_runtime_enable(dev);
+ ret = devm_pm_runtime_enable(dev);
+ if (ret < 0) {
+ dev_err(dev, "devm_pm_runtime_enable failed: %d\n", ret);
+ return ret;
+ }
+
ret = pm_runtime_resume_and_get(dev);
if (ret < 0) {
dev_err(dev, "pm_runtime_resume_and_get failed: %d\n", ret);
- goto pm_disable;
+ return ret;
}
raw_spin_lock_init(&rzg2l_irqc_data->lock);
@@ -603,8 +608,7 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node *
pm_put:
pm_runtime_put(dev);
-pm_disable:
- pm_runtime_disable(dev);
+
return ret;
}
|