i2c: designware-platdrv: refactor error handling and simplify cleanup
Subsystems (3)
PATCH v5 2/2 i2c: designware-platdrv: refactor error handling and simplify cleanup
Streamline the probe error handling by replacing goto statements with direct returns and using dev_err_probe() for consistent error reporting. This results in more linear and readable control flow.
Remove the explicit reset_control_assert() call from the driver's remove function, as the reset controller is acquired with devm_reset_control_get_optional_exclusive_deasserted() which manages the reset state automatically through devm resource management.
--- drivers/i2c/busses/i2c-designware-platdrv.c | 37 +++++++-------------- 1 file changed, 12 insertions(+), 25 deletions(-)
drivers/i2c/busses/i2c-designware-platdrv.c +12 -25
@@ -233,32 +233,26 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) ret =i2c_dw_fw_parse_and_configure (dev);if (ret) - goto exit_reset; +return ret; ret =i2c_dw_probe_lock_support (dev); -if (ret) { -dev_err_probe (device, ret,"failed to probe lock support\n" ); - goto exit_reset; - } +if (ret) +return dev_err_probe (device, ret,"failed to probe lock support\n" );i2c_dw_configure (dev);/* Optional interface clock */ dev->pclk =devm_clk_get_optional (device,"pclk" ); -if (IS_ERR (dev->pclk)) { - ret =dev_err_probe (device,PTR_ERR (dev->pclk),"failed to acquire pclk\n" ); - goto exit_reset; - } +if (IS_ERR (dev->pclk)) +return dev_err_probe (device,PTR_ERR (dev->pclk),"failed to acquire pclk\n" ); dev->clk =devm_clk_get_optional (device,NULL ); -if (IS_ERR (dev->clk)) { - ret =dev_err_probe (device,PTR_ERR (dev->clk),"failed to acquire clock\n" ); - goto exit_reset; - } +if (IS_ERR (dev->clk)) +return dev_err_probe (device,PTR_ERR (dev->clk),"failed to acquire clock\n" ); ret =i2c_dw_prepare_clk (dev, true);if (ret) - goto exit_reset; +return ret;if (dev->clk) {struct i2c_timings *t = &dev->timings;
@@ -298,17 +292,12 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)pm_runtime_enable (device); ret =i2c_dw_probe (dev); -if (ret) - goto exit_probe; +if (ret) { +dw_i2c_plat_pm_cleanup (dev); +i2c_dw_prepare_clk (dev, false); + }return ret; - -exit_probe: -dw_i2c_plat_pm_cleanup (dev); -i2c_dw_prepare_clk (dev, false); -exit_reset: -reset_control_assert (dev->rst); -return ret; }static void dw_i2c_plat_remove (struct platform_device *pdev)
@@ -327,8 +316,6 @@ static void dw_i2c_plat_remove(struct platform_device *pdev)dw_i2c_plat_pm_cleanup (dev);i2c_dw_prepare_clk (dev, false); - -reset_control_assert (dev->rst); }static const struct of_device_id dw_i2c_of_match[] = {
Signature · 1 line
2.43.0
Quoted 8 lines · Artem Shimko
Streamline the probe error handling by replacing goto statements with direct returns and using
dev_err_probe()for consistent error reporting. This results in more linear and readable control flow.Remove the explicit
reset_control_assert()call from the driver's remove function, as the reset controller is acquired withdevm_reset_control_get_optional_exclusive_deasserted()which manages the reset state automatically through devm resource management.
This change belongs in patch 1, same with the assert in the probe error path.
regards
Philipp
Quoted 6 lines · Philipp Zabel
Quoted 4 lines · Artem Shimko
Streamline the probe error handling by replacing goto statements with direct returns and using
dev_err_probe()for consistent error reporting. This results in more linear and readable control flow.
Quoted 7 lines
Quoted 4 lines
Remove the explicit
reset_control_assert()call from the driver's remove function, as the reset controller is acquired withdevm_reset_control_get_optional_exclusive_deasserted()which manages the reset state automatically through devm resource management.This change belongs in patch 1, same with the assert in the probe error path.
Hi Philipp,
You're absolutely right. I misunderstood Andy's earlier feedback in [1]. He was specifically referring to separating the dw_i2c_plat_pm_cleanup change into its own patch, not the reset_control_assert() changes.
I'll fix it.
Thank you.
[1] https://lore.kernel.org/all/[email protected]/T/#u
Regards,
artem