Hi Andi,
sorry for the delay.
On Mon, Jun 12, 2023 at 12:56:59AM +0200, Andi Shyti wrote:
> Replace the pair of functions, devm_clk_get() and
> clk_prepare_enable(), with a single function
> devm_clk_get_enabled().
>
> Signed-off-by: Andi Shyti <andi.shyti@xxxxxxxxxx>
> Cc: Pierre-Yves MORDRET <pierre-yves.mordret@xxxxxxxxxxx>
> Cc: Alain Volmat <alain.volmat@xxxxxxxxxxx>
> Cc: Maxime Coquelin <mcoquelin.stm32@xxxxxxxxx>
> Cc: Alexandre Torgue <alexandre.torgue@xxxxxxxxxxx>
> ---
> drivers/i2c/busses/i2c-stm32f7.c | 37 +++++++++++---------------------
> 1 file changed, 12 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
> index e897d9101434d..e556ba073bc0c 100644
> --- a/drivers/i2c/busses/i2c-stm32f7.c
> +++ b/drivers/i2c/busses/i2c-stm32f7.c
> @@ -2131,23 +2131,16 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
> i2c_dev->wakeup_src = of_property_read_bool(pdev->dev.of_node,
> "wakeup-source");
>
> - i2c_dev->clk = devm_clk_get(&pdev->dev, NULL);
> + i2c_dev->clk = devm_clk_get_enabled(&pdev->dev, NULL);
> if (IS_ERR(i2c_dev->clk))
> return dev_err_probe(&pdev->dev, PTR_ERR(i2c_dev->clk),
> - "Failed to get controller clock\n");
> -
> - ret = clk_prepare_enable(i2c_dev->clk);
> - if (ret) {
> - dev_err(&pdev->dev, "Failed to prepare_enable clock\n");
> - return ret;
> - }
> + "Failed to enable controller clock\n");
>
> rst = devm_reset_control_get(&pdev->dev, NULL);
> - if (IS_ERR(rst)) {
> - ret = dev_err_probe(&pdev->dev, PTR_ERR(rst),
> - "Error: Missing reset ctrl\n");
> - goto clk_free;
> - }
> + if (IS_ERR(rst))
> + return dev_err_probe(&pdev->dev, PTR_ERR(rst),
> + "Error: Missing reset ctrl\n");
> +
> reset_control_assert(rst);
> udelay(2);
> reset_control_deassert(rst);
> @@ -2162,7 +2155,7 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
> if (ret) {
> dev_err(&pdev->dev, "Failed to request irq event %i\n",
> irq_event);
> - goto clk_free;
> + return ret;
> }
>
> ret = devm_request_irq(&pdev->dev, irq_error, stm32f7_i2c_isr_error, 0,
> @@ -2170,29 +2163,28 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
> if (ret) {
> dev_err(&pdev->dev, "Failed to request irq error %i\n",
> irq_error);
> - goto clk_free;
> + return ret;
> }
>
> setup = of_device_get_match_data(&pdev->dev);
> if (!setup) {
> dev_err(&pdev->dev, "Can't get device data\n");
> - ret = -ENODEV;
> - goto clk_free;
> + return -ENODEV;
> }
> i2c_dev->setup = *setup;
>
> ret = stm32f7_i2c_setup_timing(i2c_dev, &i2c_dev->setup);
> if (ret)
> - goto clk_free;
> + return ret;
>
> /* Setup Fast mode plus if necessary */
> if (i2c_dev->bus_rate > I2C_MAX_FAST_MODE_FREQ) {
> ret = stm32f7_i2c_setup_fm_plus_bits(pdev, i2c_dev);
> if (ret)
> - goto clk_free;
> + return ret;
> ret = stm32f7_i2c_write_fm_plus_bits(i2c_dev, true);
> if (ret)
> - goto clk_free;
> + return ret;
> }
>
> adap = &i2c_dev->adap;
> @@ -2303,9 +2295,6 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
> fmp_clear:
> stm32f7_i2c_write_fm_plus_bits(i2c_dev, false);
>
> -clk_free:
> - clk_disable_unprepare(i2c_dev->clk);
> -
> return ret;
> }
>
> @@ -2339,8 +2328,6 @@ static void stm32f7_i2c_remove(struct platform_device *pdev)
> }
>
> stm32f7_i2c_write_fm_plus_bits(i2c_dev, false);
> -
> - clk_disable_unprepare(i2c_dev->clk);
> }
>
> static int __maybe_unused stm32f7_i2c_runtime_suspend(struct device *dev)
> --
> 2.40.1
>
Acked-by: Alain Volmat <alain.volmat@xxxxxxxxxxx>
Regards,
Alain
