Unverified Commit fc282a66 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'sunxi-drivers-for-6.12' of... 

Merge tag 'sunxi-drivers-for-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/drivers

Allwinner SoC driver changes for 6.12

- Simplify sunxi-rsb driver probe function using dev_err_probe()

* tag 'sunxi-drivers-for-6.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  bus: sunxi-rsb: Simplify code with dev_err_probe()

Link: https://lore.kernel.org/r/ZtnYUswjHdLRYq8Y@wens.tw


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2d516b8f 7ad250e1

drivers/bus/sunxi-rsb.c

+13 −21
Original line number Diff line number Diff line
@@ -751,12 +751,10 @@ static int sunxi_rsb_probe(struct platform_device *pdev) 
	int irq, ret;



	of_property_read_u32(np, "clock-frequency", &clk_freq);

	if (clk_freq > RSB_MAX_FREQ) {

		dev_err(dev,

	if (clk_freq > RSB_MAX_FREQ)

		return dev_err_probe(dev, -EINVAL,

				     "clock-frequency (%u Hz) is too high (max = 20MHz)\n",

				     clk_freq);

		return -EINVAL;

	}



	rsb = devm_kzalloc(dev, sizeof(*rsb), GFP_KERNEL);

	if (!rsb)
@@ -774,28 +772,22 @@ static int sunxi_rsb_probe(struct platform_device *pdev) 
		return irq;



	rsb->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(rsb->clk)) {

		ret = PTR_ERR(rsb->clk);

		dev_err(dev, "failed to retrieve clk: %d\n", ret);

		return ret;

	}

	if (IS_ERR(rsb->clk))

		return dev_err_probe(dev, PTR_ERR(rsb->clk),

				     "failed to retrieve clk\n");



	rsb->rstc = devm_reset_control_get(dev, NULL);

	if (IS_ERR(rsb->rstc)) {

		ret = PTR_ERR(rsb->rstc);

		dev_err(dev, "failed to retrieve reset controller: %d\n", ret);

		return ret;

	}

	if (IS_ERR(rsb->rstc))

		return dev_err_probe(dev, PTR_ERR(rsb->rstc),

				     "failed to retrieve reset controller\n");



	init_completion(&rsb->complete);

	mutex_init(&rsb->lock);



	ret = devm_request_irq(dev, irq, sunxi_rsb_irq, 0, RSB_CTRL_NAME, rsb);

	if (ret) {

		dev_err(dev, "can't register interrupt handler irq %d: %d\n",

			irq, ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret,

				     "can't register interrupt handler irq %d\n", irq);



	ret = sunxi_rsb_hw_init(rsb);

	if (ret)