[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <160243906116.7002.7305735851791605051.tip-bot2@tip-bot2>
Date: Sun, 11 Oct 2020 17:57:41 -0000
From: "tip-bot2 for Anson Huang" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Anson Huang <Anson.Huang@....com>, Marc Zyngier <maz@...nel.org>,
x86 <x86@...nel.org>, LKML <linux-kernel@...r.kernel.org>
Subject: [tip: irq/core] irqchip/imx-intmux: Use dev_err_probe() to simplify
error handling
The following commit has been merged into the irq/core branch of tip:
Commit-ID: c201f4325588a3b0109ba552a20bd4d4b1b5c6c8
Gitweb: https://git.kernel.org/tip/c201f4325588a3b0109ba552a20bd4d4b1b5c6c8
Author: Anson Huang <Anson.Huang@....com>
AuthorDate: Tue, 11 Aug 2020 14:16:15 +08:00
Committer: Marc Zyngier <maz@...nel.org>
CommitterDate: Sun, 13 Sep 2020 17:38:52 +01:00
irqchip/imx-intmux: Use dev_err_probe() to simplify error handling
dev_err_probe() can reduce code size, uniform error handling and record the
defer probe reason etc., use it to simplify the code.
Signed-off-by: Anson Huang <Anson.Huang@....com>
Signed-off-by: Marc Zyngier <maz@...nel.org>
Link: https://lore.kernel.org/r/1597126576-18383-1-git-send-email-Anson.Huang@nxp.com
---
drivers/irqchip/irq-imx-intmux.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/irqchip/irq-imx-intmux.c b/drivers/irqchip/irq-imx-intmux.c
index e35b7b0..7709f97 100644
--- a/drivers/irqchip/irq-imx-intmux.c
+++ b/drivers/irqchip/irq-imx-intmux.c
@@ -226,12 +226,9 @@ static int imx_intmux_probe(struct platform_device *pdev)
}
data->ipg_clk = devm_clk_get(&pdev->dev, "ipg");
- if (IS_ERR(data->ipg_clk)) {
- ret = PTR_ERR(data->ipg_clk);
- if (ret != -EPROBE_DEFER)
- dev_err(&pdev->dev, "failed to get ipg clk: %d\n", ret);
- return ret;
- }
+ if (IS_ERR(data->ipg_clk))
+ return dev_err_probe(&pdev->dev, PTR_ERR(data->ipg_clk),
+ "failed to get ipg clk\n");
data->channum = channum;
raw_spin_lock_init(&data->lock);
Powered by blists - more mailing lists