mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
i2c: mv64xxx: simplify optional reset handling
As of commit bb475230b8
("reset: make optional functions really
optional"), the reset framework API calls use NULL pointers to describe
optional, non-present reset controls.
This allows to return errors from devm_reset_control_get_optional and to
call reset_control_(de)assert unconditionally.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
parent
1ae5214a22
commit
074363a5a0
1 changed files with 5 additions and 10 deletions
|
@ -823,13 +823,10 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
|
|||
|
||||
drv_data->rstc = devm_reset_control_get_optional(dev, NULL);
|
||||
if (IS_ERR(drv_data->rstc)) {
|
||||
if (PTR_ERR(drv_data->rstc) == -EPROBE_DEFER) {
|
||||
rc = -EPROBE_DEFER;
|
||||
goto out;
|
||||
}
|
||||
} else {
|
||||
reset_control_deassert(drv_data->rstc);
|
||||
rc = PTR_ERR(drv_data->rstc);
|
||||
goto out;
|
||||
}
|
||||
reset_control_deassert(drv_data->rstc);
|
||||
|
||||
/* Its not yet defined how timeouts will be specified in device tree.
|
||||
* So hard code the value to 1 second.
|
||||
|
@ -951,8 +948,7 @@ mv64xxx_i2c_probe(struct platform_device *pd)
|
|||
exit_free_irq:
|
||||
free_irq(drv_data->irq, drv_data);
|
||||
exit_reset:
|
||||
if (!IS_ERR_OR_NULL(drv_data->rstc))
|
||||
reset_control_assert(drv_data->rstc);
|
||||
reset_control_assert(drv_data->rstc);
|
||||
exit_clk:
|
||||
/* Not all platforms have a clk */
|
||||
if (!IS_ERR(drv_data->clk))
|
||||
|
@ -968,8 +964,7 @@ mv64xxx_i2c_remove(struct platform_device *dev)
|
|||
|
||||
i2c_del_adapter(&drv_data->adapter);
|
||||
free_irq(drv_data->irq, drv_data);
|
||||
if (!IS_ERR_OR_NULL(drv_data->rstc))
|
||||
reset_control_assert(drv_data->rstc);
|
||||
reset_control_assert(drv_data->rstc);
|
||||
/* Not all platforms have a clk */
|
||||
if (!IS_ERR(drv_data->clk))
|
||||
clk_disable_unprepare(drv_data->clk);
|
||||
|
|
Loading…
Reference in a new issue