| Message ID | 208546ce4e01973da1eb9ad7bc0f9241f650b3af.1672415956.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/bridge: tc358767: Use devm_clk_get_enabled() helper | expand |
Hi Christophe, On 30/12/2022 17:00, 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> > Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> > --- > Change in v2: > - Convert to dev_err_probe() [Andrzej Hajda] > - Update the error message [Andrzej Hajda] > - Add R-b tag [Andrzej Hajda] This doesn't apply on drm-misc-next, please re-spin. Thanks. Neil > > v1: > https://lore.kernel.org/all/4f855984ea895e1488169e77935fa6e044912ac2.1672414073.git.christophe.jaillet@wanadoo.fr/ > --- > drivers/gpu/drm/bridge/tc358767.c | 25 ++++--------------------- > 1 file changed, 4 insertions(+), 21 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c > index 2a58eb271f70..99f3d5ca7257 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,20 +2038,10 @@ 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"); > - 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; > + tc->refclk = devm_clk_get_enabled(dev, "ref"); > + if (IS_ERR(tc->refclk)) > + return dev_err_probe(dev, PTR_ERR(tc->refclk), > + "Failed to get and enable the ref clk\n"); > > /* 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..99f3d5ca7257 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,20 +2038,10 @@ 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"); - 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; + tc->refclk = devm_clk_get_enabled(dev, "ref"); + if (IS_ERR(tc->refclk)) + return dev_err_probe(dev, PTR_ERR(tc->refclk), + "Failed to get and enable the ref clk\n"); /* 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> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com> --- Change in v2: - Convert to dev_err_probe() [Andrzej Hajda] - Update the error message [Andrzej Hajda] - Add R-b tag [Andrzej Hajda] v1: https://lore.kernel.org/all/4f855984ea895e1488169e77935fa6e044912ac2.1672414073.git.christophe.jaillet@wanadoo.fr/ --- drivers/gpu/drm/bridge/tc358767.c | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-)