irqchip/ti-sci: Simplify with dev_err_probe()

Common pattern of handling deferred probe can be simplified with
dev_err_probe().  Less code and the error value gets printed.

There is also no need to assign NULL to 'intr->sci' as it is part of
devm-allocated memory.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200902174615.24695-1-krzk@kernel.org

diff --git a/drivers/irqchip/irq-ti-sci-inta.c b/drivers/irqchip/irq-ti-sci-inta.c
index d4e97605456bba1c3958fb0affb276227b044114..bc863ef7998df11f56c9ca4a429fdaf6b34b836e 100644 (file)
--- a/drivers/irqchip/irq-ti-sci-inta.c
+++ b/drivers/irqchip/irq-ti-sci-inta.c
@@ -600,13 +600,9 @@ static int ti_sci_inta_irq_domain_probe(struct platform_device *pdev)
 
        inta->pdev = pdev;
        inta->sci = devm_ti_sci_get_by_phandle(dev, "ti,sci");
-       if (IS_ERR(inta->sci)) {
-               ret = PTR_ERR(inta->sci);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "ti,sci read fail %d\n", ret);
-               inta->sci = NULL;
-               return ret;
-       }
+       if (IS_ERR(inta->sci))
+               return dev_err_probe(dev, PTR_ERR(inta->sci),
+                                    "ti,sci read fail\n");
 
        ret = of_property_read_u32(dev->of_node, "ti,sci-dev-id", &inta->ti_sci_id);
        if (ret) {

diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci-intr.c
index cbc1758228d9e91a98dd2ef8aaa13ff060d85907..6a6fb6616c21110df07e9d1c54330e9844037020 100644 (file)
--- a/drivers/irqchip/irq-ti-sci-intr.c
+++ b/drivers/irqchip/irq-ti-sci-intr.c
@@ -254,13 +254,9 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev)
        }
 
        intr->sci = devm_ti_sci_get_by_phandle(dev, "ti,sci");
-       if (IS_ERR(intr->sci)) {
-               ret = PTR_ERR(intr->sci);
-               if (ret != -EPROBE_DEFER)
-                       dev_err(dev, "ti,sci read fail %d\n", ret);
-               intr->sci = NULL;
-               return ret;
-       }
+       if (IS_ERR(intr->sci))
+               return dev_err_probe(dev, PTR_ERR(intr->sci),
+                                    "ti,sci read fail\n");
 
        ret = of_property_read_u32(dev_of_node(dev), "ti,sci-dev-id",
                                   &intr->ti_sci_id);