Skip to contentSkip to conversation

irqchip/imx-intmux: Use dev_err_probe() to simplify error handling

PATCH Applied Anson Huang 3 participants 5 messages Aug 11, 2020 – Oct 11, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 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.

---
changes since V1:
- remove redundant return value print.

---
 drivers/irqchip/irq-imx-intmux.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/irqchip/irq-imx-intmux.c +3 -6
index e35b7b0..7709f97 100644
@@ -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);
Signature · 1 line
2.7.4
#1 lore raw

PATCH v2 2/2 irqchip/imx-irqsteer: 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.

---
changes since V1:
- remove redundant return value print.

---
 drivers/irqchip/irq-imx-irqsteer.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/irqchip/irq-imx-irqsteer.c +3 -6
index 290531e..1edf769 100644
@@ -158,12 +158,9 @@ static int imx_irqsteer_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");
 
 	raw_spin_lock_init(&data->lock);
 
Signature · 1 line
2.7.4
merge bot Applied
#2 lore raw

[tip: irq/core] irqchip/imx-irqsteer: Use dev_err_probe() to simplify error handling

The following commit has been merged into the irq/core branch of tip:

The following commit has been merged into the irq/core branch of tip:

Commit-ID:     e0c45b107fc94c5a7a230b25cdbecab004ab1ed5
Gitweb:        https://git.kernel.org/tip/e0c45b107fc94c5a7a230b25cdbecab004ab1ed5
Author:        Anson Huang <[email protected]>
AuthorDate:    Tue, 11 Aug 2020 14:16:16 +08:00
Committer:     Marc Zyngier <[email protected]>
CommitterDate: Sun, 13 Sep 2020 17:38:52 +01:00

irqchip/imx-irqsteer: 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.

---
 drivers/irqchip/irq-imx-irqsteer.c |  9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/irqchip/irq-imx-irqsteer.c +3 -6
index 290531e..1edf769 100644
@@ -158,12 +158,9 @@ static int imx_irqsteer_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");
 
 	raw_spin_lock_init(&data->lock);
 
maintainer Applied
#3 lore raw
In reply to Anson Huang
Quoted 2 lines · Anson Huang

dev_err_probe() can reduce code size, uniform error handling and record the defer probe reason etc., use it to simplify the code.

Applied to irq/irqchip-next, thanks!

[1/2] irqchip/imx-intmux: Use dev_err_probe() to simplify error handling

      commit: c201f4325588a3b0109ba552a20bd4d4b1b5c6c8
[2/2] irqchip/imx-irqsteer: Use dev_err_probe() to simplify error handling
      commit: e0c45b107fc94c5a7a230b25cdbecab004ab1ed5

Cheers,

	M.
Signature · 7 lines
Without deviation from the norm, progress is not possible.


_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
merge bot Applied
#4 lore raw
In reply to Anson Huang
The following commit has been merged into the irq/core branch of tip:

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 <[email protected]>
AuthorDate:    Tue, 11 Aug 2020 14:16:15 +08:00
Committer:     Marc Zyngier <[email protected]>
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.

---
 drivers/irqchip/irq-imx-intmux.c |  9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/irqchip/irq-imx-intmux.c +3 -6
index e35b7b0..7709f97 100644
@@ -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);