Commit 3c5e6ae4 authored by Liao Chang's avatar Liao Chang Committed by Andi Shyti
Browse files

i2c: hisi: Use dev_err_probe in probe function 



Use the dev_err_probe function instead of dev_err in the probe function
so that the printed message includes the return value and also handles
-EPROBE_DEFER nicely.

Signed-off-by: default avatarLiao Chang <liaochang1@huawei.com>
Reviewed-by: default avatarYicong Yang <yangyicong@hisilicon.com>
Link: https://lore.kernel.org/r/20230808012954.1643834-5-liaochang1@huawei.com


Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 9a648b3f

drivers/i2c/busses/i2c-hisi.c

+4 −8
Original line number Diff line number Diff line
@@ -462,18 +462,14 @@ static int hisi_i2c_probe(struct platform_device *pdev) 
	hisi_i2c_disable_int(ctlr, HISI_I2C_INT_ALL);



	ret = devm_request_irq(dev, ctlr->irq, hisi_i2c_irq, 0, "hisi-i2c", ctlr);

	if (ret) {

		dev_err(dev, "failed to request irq handler, ret = %d\n", ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "failed to request irq handler\n");



	ctlr->clk = devm_clk_get_optional_enabled(&pdev->dev, NULL);

	if (IS_ERR_OR_NULL(ctlr->clk)) {

		ret = device_property_read_u64(dev, "clk_rate", &clk_rate_hz);

		if (ret) {

			dev_err(dev, "failed to get clock frequency, ret = %d\n", ret);

			return ret;

		}

		if (ret)

			return dev_err_probe(dev, ret, "failed to get clock frequency\n");

	} else {

		clk_rate_hz = clk_get_rate(ctlr->clk);

	}