diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2019-08-19 13:31:30 +0300 |
|---|---|---|
| committer |   Wolfram Sang <wsa@the-dreams.de> | 2019-08-29 22:10:06 +0200 |
| commit | a6af48ec0712a0c98d8abe6b47c655b26026fceb (patch) | |
| tree | 3e1cf4c3a6efff590c8073f97e6ce8832a8f7e5d /drivers/i2c | |
| parent | i2c: designware: assert reset when error happen at ->probe() (diff) | |
| download | linux-dev-a6af48ec0712a0c98d8abe6b47c655b26026fceb.tar.xz linux-dev-a6af48ec0712a0c98d8abe6b47c655b26026fceb.zip | |
i2c: designware: Fix optional reset error handling
The commit bb475230b8e5 ("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>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware-platdrv.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c index 4624ef8fbae8..16dd338877d0 100644 --- a/drivers/i2c/busses/i2c-designware-platdrv.c +++ b/drivers/i2c/busses/i2c-designware-platdrv.c @@ -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 { - reset_control_deassert(dev->rst); - } + if (IS_ERR(dev->rst)) + return PTR_ERR(dev->rst); + + reset_control_deassert(dev->rst); t = &dev->timings; if (pdata) @@ -402,8 +400,7 @@ 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); + reset_control_assert(dev->rst); return ret; } @@ -421,8 +418,7 @@ 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); + reset_control_assert(dev->rst); return 0; } |