| Message ID | 4f855984ea895e1488169e77935fa6e044912ac2.1672414073.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/bridge: tc358767: Use devm_clk_get_enabled() helper | expand |
On 30.12.2022 16:29, Christophe JAILLET wrote: > 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 <christophe.jaillet@wanadoo.fr> > --- > drivers/gpu/drm/bridge/tc358767.c | 17 +---------------- > 1 file changed, 1 insertion(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c > index 2a58eb271f70..b95c36ca660d 100644 > --- a/drivers/gpu/drm/bridge/tc358767.c > +++ b/drivers/gpu/drm/bridge/tc358767.c > @@ -2022,13 +2022,6 @@ static int tc_probe_bridge_endpoint(struct tc_data *tc) > return -EINVAL; > } > > -static void tc_clk_disable(void *data) > -{ > - struct clk *refclk = data; > - > - clk_disable_unprepare(refclk); > -} > - > static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) > { > struct device *dev = &client->dev; > @@ -2045,21 +2038,13 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) > if (ret) > return ret; > > - tc->refclk = devm_clk_get(dev, "ref"); > + tc->refclk = devm_clk_get_enabled(dev, "ref"); > if (IS_ERR(tc->refclk)) { > ret = PTR_ERR(tc->refclk); > dev_err(dev, "Failed to get refclk: %d\n", ret); You can adjust the message and convert to dev_err_probe. With that: Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> Regards Andrzej > return ret; > } > > - ret = clk_prepare_enable(tc->refclk); > - if (ret) > - return ret; > - > - ret = devm_add_action_or_reset(dev, tc_clk_disable, tc->refclk); > - if (ret) > - return ret; > - > /* tRSTW = 100 cycles , at 13 MHz that is ~7.69 us */ > usleep_range(10, 15); >
diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index 2a58eb271f70..b95c36ca660d 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -2022,13 +2022,6 @@ static int tc_probe_bridge_endpoint(struct tc_data *tc) return -EINVAL; } -static void tc_clk_disable(void *data) -{ - struct clk *refclk = data; - - clk_disable_unprepare(refclk); -} - static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct device *dev = &client->dev; @@ -2045,21 +2038,13 @@ static int tc_probe(struct i2c_client *client, const struct i2c_device_id *id) if (ret) return ret; - tc->refclk = devm_clk_get(dev, "ref"); + tc->refclk = devm_clk_get_enabled(dev, "ref"); if (IS_ERR(tc->refclk)) { ret = PTR_ERR(tc->refclk); dev_err(dev, "Failed to get refclk: %d\n", ret); return ret; } - ret = clk_prepare_enable(tc->refclk); - if (ret) - return ret; - - ret = devm_add_action_or_reset(dev, tc_clk_disable, tc->refclk); - if (ret) - return ret; - /* tRSTW = 100 cycles , at 13 MHz that is ~7.69 us */ usleep_range(10, 15);
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 <christophe.jaillet@wanadoo.fr> --- drivers/gpu/drm/bridge/tc358767.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-)