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

[linux-2.6-microblaze.git] / drivers / irqchip / irq-imx-intmux.c

diff --git a/drivers/irqchip/irq-imx-intmux.c b/drivers/irqchip/irq-imx-intmux.c
index e35b7b0..7709f97 100644 (file)
--- 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);