UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

i2c: designware: Fix optional reset error handling 

The commit bb475230b8 ("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>
This commit is contained in:
Andy Shevchenko 2019-08-19 13:31:30 +03:00 committed by Wolfram Sang
parent 71dc297ca9
commit a6af48ec07
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/i2c/busses/i2c-designware-platdrv.c
View File

@ -279,12 +279,10 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, dev); platform_set_drvdata(pdev, dev);
dev->rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL); dev->rst = devm_reset_control_get_optional_exclusive(&pdev->dev, NULL);
if (IS_ERR(dev->rst)) { if (IS_ERR(dev->rst))
if (PTR_ERR(dev->rst) == -EPROBE_DEFER) return PTR_ERR(dev->rst);
return -EPROBE_DEFER;
} else { reset_control_deassert(dev->rst);
reset_control_deassert(dev->rst);
}
t = &dev->timings; t = &dev->timings;
if (pdata) if (pdata)
@ -402,8 +400,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
exit_probe: exit_probe:
dw_i2c_plat_pm_cleanup(dev); dw_i2c_plat_pm_cleanup(dev);
exit_reset: exit_reset:
if (!IS_ERR_OR_NULL(dev->rst)) reset_control_assert(dev->rst);
reset_control_assert(dev->rst);
return ret; return ret;
} }
@ -421,8 +418,7 @@ static int dw_i2c_plat_remove(struct platform_device *pdev)
pm_runtime_put_sync(&pdev->dev); pm_runtime_put_sync(&pdev->dev);
dw_i2c_plat_pm_cleanup(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; return 0;
} }