Skip to content

Commit 70d3c92

Browse files
tititiou36robertfoss
authored andcommitted
drm/bridge: tc358767: Use devm_clk_get_enabled() helper
The devm_clk_get_enabled() helper: - calls devm_clk_get() - calls clk_prepare_enable() and registers what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code and avoids the need of a dedicated function used with devm_add_action_or_reset(). Signed-off-by: Christophe JAILLET <[email protected]> Reviewed-by: Andrzej Hajda <[email protected]> Signed-off-by: Robert Foss <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/208a15ce4e01973daf039ad7bc0f9241f650b3af.1672415956.git.christophe.jaillet@wanadoo.fr
1 parent 3b85641 commit 70d3c92

File tree

1 file changed

+4
-21
lines changed

1 file changed

+4
-21
lines changed

drivers/gpu/drm/bridge/tc358767.c

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2215,13 +2215,6 @@ static int tc_probe_bridge_endpoint(struct tc_data *tc)
22152215
return -EINVAL;
22162216
}
22172217

2218-
static void tc_clk_disable(void *data)
2219-
{
2220-
struct clk *refclk = data;
2221-
2222-
clk_disable_unprepare(refclk);
2223-
}
2224-
22252218
static int tc_probe(struct i2c_client *client)
22262219
{
22272220
struct device *dev = &client->dev;
@@ -2238,20 +2231,10 @@ static int tc_probe(struct i2c_client *client)
22382231
if (ret)
22392232
return ret;
22402233

2241-
tc->refclk = devm_clk_get(dev, "ref");
2242-
if (IS_ERR(tc->refclk)) {
2243-
ret = PTR_ERR(tc->refclk);
2244-
dev_err(dev, "Failed to get refclk: %d\n", ret);
2245-
return ret;
2246-
}
2247-
2248-
ret = clk_prepare_enable(tc->refclk);
2249-
if (ret)
2250-
return ret;
2251-
2252-
ret = devm_add_action_or_reset(dev, tc_clk_disable, tc->refclk);
2253-
if (ret)
2254-
return ret;
2234+
tc->refclk = devm_clk_get_enabled(dev, "ref");
2235+
if (IS_ERR(tc->refclk))
2236+
return dev_err_probe(dev, PTR_ERR(tc->refclk),
2237+
"Failed to get and enable the ref clk\n");
22552238

22562239
/* tRSTW = 100 cycles , at 13 MHz that is ~7.69 us */
22572240
usleep_range(10, 15);

0 commit comments

Comments
 (0)