Commit bf476c60 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge remote-tracking branch 'origin/irq/dev_err_probe' into irq/irqchip-next 



Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents cd4c3566 e0c45b10

drivers/irqchip/irq-imx-intmux.c

+3 −6
Original line number Diff line number Diff line
@@ -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);

drivers/irqchip/irq-imx-irqsteer.c

+3 −6
Original line number Diff line number Diff line
@@ -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);

drivers/irqchip/irq-ti-sci-inta.c

+3 −7
Original line number Diff line number Diff line
@@ -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) {

drivers/irqchip/irq-ti-sci-intr.c

+3 −7
Original line number Diff line number Diff line
@@ -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);