i2c: designware: Fix optional reset error handling (a6af48ec) · Commits · 戴 / test

The commit ("reset: make optional functions really optional") brought a missed part of the support for an optional reset handlers. Since that we don't need to have special error handling in the driver. Signed-off-by:

Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by:

Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by:

Wolfram Sang <wsa@the-dreams.de>

drivers/i2c/busses/i2c-designware-platdrv.c

+6 −10

Original line number	Diff line number	Diff line
		@@ -279,12 +279,10 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
		platform_set_drvdata(pdev, dev);

		dev->rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);
		if (IS_ERR(dev->rst)) {
		if (PTR_ERR(dev->rst) == -EPROBE_DEFER)
		return -EPROBE_DEFER;
		} else {
		if (IS_ERR(dev->rst))
		return PTR_ERR(dev->rst);

		reset_control_deassert(dev->rst);
		}

		t = &dev->timings;
		if (pdata)
		@@ -402,7 +400,6 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
		exit_probe:
		dw_i2c_plat_pm_cleanup(dev);
		exit_reset:
		if (!IS_ERR_OR_NULL(dev->rst))
		reset_control_assert(dev->rst);
		return ret;
		}
		@@ -421,7 +418,6 @@ static int dw_i2c_plat_remove(struct platform_device *pdev)
		pm_runtime_put_sync(&pdev->dev);
		dw_i2c_plat_pm_cleanup(dev);

		if (!IS_ERR_OR_NULL(dev->rst))
		reset_control_assert(dev->rst);

		return 0;

Admin message