Skip to content

Commit 9aaccc6

Browse files
Andi Shytiwsakernel
authored andcommitted
i2c: pasemi-platform: 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: Andi Shyti <[email protected]> Reviewed-by: Alyssa Rosenzweig <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent 2158566 commit 9aaccc6

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

drivers/i2c/busses/i2c-pasemi-platform.c

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,22 +66,18 @@ static int pasemi_platform_i2c_probe(struct platform_device *pdev)
6666
if (of_property_read_u32(dev->of_node, "clock-frequency", &frequency))
6767
frequency = I2C_MAX_STANDARD_MODE_FREQ;
6868

69-
data->clk_ref = devm_clk_get(dev, NULL);
69+
data->clk_ref = devm_clk_get_enabled(dev, NULL);
7070
if (IS_ERR(data->clk_ref))
7171
return PTR_ERR(data->clk_ref);
7272

73-
error = clk_prepare_enable(data->clk_ref);
74-
if (error)
75-
return error;
76-
7773
error = pasemi_platform_i2c_calc_clk_div(data, frequency);
7874
if (error)
79-
goto out_clk_disable;
75+
return error;
8076

8177
smbus->adapter.dev.of_node = pdev->dev.of_node;
8278
error = pasemi_i2c_common_probe(smbus);
8379
if (error)
84-
goto out_clk_disable;
80+
return error;
8581

8682
irq_num = platform_get_irq(pdev, 0);
8783
error = devm_request_irq(smbus->dev, irq_num, pasemi_irq_handler, 0, "pasemi_apple_i2c", (void *)smbus);
@@ -91,19 +87,9 @@ static int pasemi_platform_i2c_probe(struct platform_device *pdev)
9187
platform_set_drvdata(pdev, data);
9288

9389
return 0;
94-
95-
out_clk_disable:
96-
clk_disable_unprepare(data->clk_ref);
97-
98-
return error;
9990
}
10091

101-
static void pasemi_platform_i2c_remove(struct platform_device *pdev)
102-
{
103-
struct pasemi_platform_i2c_data *data = platform_get_drvdata(pdev);
104-
105-
clk_disable_unprepare(data->clk_ref);
106-
}
92+
static void pasemi_platform_i2c_remove(struct platform_device *pdev) { }
10793

10894
static const struct of_device_id pasemi_platform_i2c_of_match[] = {
10995
{ .compatible = "apple,t8103-i2c" },

0 commit comments

Comments
 (0)