Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 074363a5 authored by Philipp Zabel's avatar Philipp Zabel Committed by Wolfram Sang
Browse files

i2c: mv64xxx: simplify optional reset handling 



As of commit bb475230 ("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: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 1ae5214a

drivers/i2c/busses/i2c-mv64xxx.c

+5 −10
Original line number Diff line number Diff line
@@ -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;

		rc = PTR_ERR(drv_data->rstc);

		goto out;

	}

	} else {

	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,7 +948,6 @@ 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);

exit_clk:

	/* Not all platforms have a clk */
@@ -968,7 +964,6 @@ 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);

	/* Not all platforms have a clk */

	if (!IS_ERR(drv_data->clk))