diff options
| author |   Fabrizio Castro <fabrizio.castro.jz@renesas.com> | 2025-02-12 18:20:33 +0000 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2025-02-18 09:03:52 +0100 |
| commit | 4bd0317ce63c26c8a1b6e96c9be0badac749c6f7 (patch) | |
| tree | a953c7b3b878ac6926ecc306921116e7e43005d7 | |
| parent | irqchip/renesas-rzg2l: Remove pm_put label (diff) | |
| download | wireguard-linux-4bd0317ce63c26c8a1b6e96c9be0badac749c6f7.tar.xz wireguard-linux-4bd0317ce63c26c8a1b6e96c9be0badac749c6f7.zip | |
irqchip/renesas-rzg2l: Switch to using dev_err_probe()
Make use of dev_err_probe() to simplify rzg2l_irqc_common_init().
Signed-off-by: Fabrizio Castro <fabrizio.castro.jz@renesas.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://lore.kernel.org/all/20250212182034.366167-6-fabrizio.castro.jz@renesas.com
| -rw-r--r-- | drivers/irqchip/irq-renesas-rzg2l.c | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-renesas-rzg2l.c index 0f325ceb0f53..8714e7fdbbda 100644 --- a/drivers/irqchip/irq-renesas-rzg2l.c +++ b/drivers/irqchip/irq-renesas-rzg2l.c @@ -541,10 +541,8 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node * return -ENODEV; parent_domain = irq_find_host(parent); - if (!parent_domain) { - dev_err(dev, "cannot find parent domain\n"); - return -ENODEV; - } + if (!parent_domain) + return dev_err_probe(dev, -ENODEV, "cannot find parent domain\n"); rzg2l_irqc_data = devm_kzalloc(dev, sizeof(*rzg2l_irqc_data), GFP_KERNEL); if (!rzg2l_irqc_data) @@ -557,28 +555,22 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node * return PTR_ERR(rzg2l_irqc_data->base); ret = rzg2l_irqc_parse_interrupts(rzg2l_irqc_data, node); - if (ret) { - dev_err(dev, "cannot parse interrupts: %d\n", ret); - return ret; - } + if (ret) + return dev_err_probe(dev, ret, "cannot parse interrupts: %d\n", ret); resetn = devm_reset_control_get_exclusive_deasserted(dev, NULL); if (IS_ERR(resetn)) { - dev_err(dev, "failed to acquire deasserted reset: %d\n", ret); - return PTR_ERR(resetn); + return dev_err_probe(dev, PTR_ERR(resetn), + "failed to acquire deasserted reset: %d\n", ret); } ret = devm_pm_runtime_enable(dev); - if (ret < 0) { - dev_err(dev, "devm_pm_runtime_enable failed: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "devm_pm_runtime_enable failed: %d\n", ret); ret = pm_runtime_resume_and_get(dev); - if (ret < 0) { - dev_err(dev, "pm_runtime_resume_and_get failed: %d\n", ret); - return ret; - } + if (ret < 0) + return dev_err_probe(dev, ret, "pm_runtime_resume_and_get failed: %d\n", ret); raw_spin_lock_init(&rzg2l_irqc_data->lock); @@ -587,8 +579,7 @@ static int rzg2l_irqc_common_init(struct device_node *node, struct device_node * rzg2l_irqc_data); if (!irq_domain) { pm_runtime_put(dev); - dev_err(dev, "failed to add irq domain\n"); - return -ENOMEM; + return dev_err_probe(dev, -ENOMEM, "failed to add irq domain\n"); } register_syscore_ops(&rzg2l_irqc_syscore_ops); |