Commit 7ba2b17a authored by Andi Shyti's avatar Andi Shyti Committed by Wolfram Sang

i2c: stm32f7: Use devm_clk_get_enabled()

Replace the pair of functions, devm_clk_get() and
clk_prepare_enable(), with a single function
devm_clk_get_enabled().
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Acked-by: default avatarAlain Volmat <alain.volmat@foss.st.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 06c5a1d6
...@@ -2175,23 +2175,16 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) ...@@ -2175,23 +2175,16 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
i2c_dev->wakeup_src = of_property_read_bool(pdev->dev.of_node, i2c_dev->wakeup_src = of_property_read_bool(pdev->dev.of_node,
"wakeup-source"); "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)) if (IS_ERR(i2c_dev->clk))
return dev_err_probe(&pdev->dev, PTR_ERR(i2c_dev->clk), return dev_err_probe(&pdev->dev, PTR_ERR(i2c_dev->clk),
"Failed to get controller clock\n"); "Failed to enable controller clock\n");
ret = clk_prepare_enable(i2c_dev->clk);
if (ret) {
dev_err(&pdev->dev, "Failed to prepare_enable clock\n");
return ret;
}
rst = devm_reset_control_get(&pdev->dev, NULL); rst = devm_reset_control_get(&pdev->dev, NULL);
if (IS_ERR(rst)) { if (IS_ERR(rst))
ret = dev_err_probe(&pdev->dev, PTR_ERR(rst), return dev_err_probe(&pdev->dev, PTR_ERR(rst),
"Error: Missing reset ctrl\n"); "Error: Missing reset ctrl\n");
goto clk_free;
}
reset_control_assert(rst); reset_control_assert(rst);
udelay(2); udelay(2);
reset_control_deassert(rst); reset_control_deassert(rst);
...@@ -2206,7 +2199,7 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) ...@@ -2206,7 +2199,7 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to request irq event %i\n", dev_err(&pdev->dev, "Failed to request irq event %i\n",
irq_event); irq_event);
goto clk_free; return ret;
} }
ret = devm_request_irq(&pdev->dev, irq_error, stm32f7_i2c_isr_error, 0, ret = devm_request_irq(&pdev->dev, irq_error, stm32f7_i2c_isr_error, 0,
...@@ -2214,29 +2207,28 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) ...@@ -2214,29 +2207,28 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to request irq error %i\n", dev_err(&pdev->dev, "Failed to request irq error %i\n",
irq_error); irq_error);
goto clk_free; return ret;
} }
setup = of_device_get_match_data(&pdev->dev); setup = of_device_get_match_data(&pdev->dev);
if (!setup) { if (!setup) {
dev_err(&pdev->dev, "Can't get device data\n"); dev_err(&pdev->dev, "Can't get device data\n");
ret = -ENODEV; return -ENODEV;
goto clk_free;
} }
i2c_dev->setup = *setup; i2c_dev->setup = *setup;
ret = stm32f7_i2c_setup_timing(i2c_dev, &i2c_dev->setup); ret = stm32f7_i2c_setup_timing(i2c_dev, &i2c_dev->setup);
if (ret) if (ret)
goto clk_free; return ret;
/* Setup Fast mode plus if necessary */ /* Setup Fast mode plus if necessary */
if (i2c_dev->bus_rate > I2C_MAX_FAST_MODE_FREQ) { if (i2c_dev->bus_rate > I2C_MAX_FAST_MODE_FREQ) {
ret = stm32f7_i2c_setup_fm_plus_bits(pdev, i2c_dev); ret = stm32f7_i2c_setup_fm_plus_bits(pdev, i2c_dev);
if (ret) if (ret)
goto clk_free; return ret;
ret = stm32f7_i2c_write_fm_plus_bits(i2c_dev, true); ret = stm32f7_i2c_write_fm_plus_bits(i2c_dev, true);
if (ret) if (ret)
goto clk_free; return ret;
} }
adap = &i2c_dev->adap; adap = &i2c_dev->adap;
...@@ -2347,9 +2339,6 @@ static int stm32f7_i2c_probe(struct platform_device *pdev) ...@@ -2347,9 +2339,6 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
fmp_clear: fmp_clear:
stm32f7_i2c_write_fm_plus_bits(i2c_dev, false); stm32f7_i2c_write_fm_plus_bits(i2c_dev, false);
clk_free:
clk_disable_unprepare(i2c_dev->clk);
return ret; return ret;
} }
...@@ -2383,8 +2372,6 @@ static void stm32f7_i2c_remove(struct platform_device *pdev) ...@@ -2383,8 +2372,6 @@ static void stm32f7_i2c_remove(struct platform_device *pdev)
} }
stm32f7_i2c_write_fm_plus_bits(i2c_dev, false); 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) static int __maybe_unused stm32f7_i2c_runtime_suspend(struct device *dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment