diff options
| author | Sivaram Nair <sivaramn@nvidia.com> | 2012-11-01 17:44:15 +0200 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:43:36 -0700 |
| commit | bc3f4e48c9a169887ba0f6e68f47c54f658a3c0a (patch) | |
| tree | 93166ce428781b53dc81c364edaa78202528fb36 /drivers/hwmon | |
| parent | 4b1c565a6332849ce9f19782b963fa18557f0dc2 (diff) | |
hwmon: tegra-tsensor: moving to clk prepare APIs
The clk_enable/clk_disable pair of APIs are replaced with
clk_prepare_enable and clk_disable_unprepare.
This is needed for the migration to common clk framework.
Bug 920915
Change-Id: I1b5939d7714c21549b4e7e63c223bcac8e66f951
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
Reviewed-on: http://git-master/r/162324
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/tegra-tsensor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/tegra-tsensor.c b/drivers/hwmon/tegra-tsensor.c index 4f41363d7873..43cc37a5bbb6 100644 --- a/drivers/hwmon/tegra-tsensor.c +++ b/drivers/hwmon/tegra-tsensor.c @@ -1463,7 +1463,7 @@ static int tsensor_clk_enable( struct clk *clk_m; if (enable) { - clk_enable(data->dev_clk); + clk_prepare_enable(data->dev_clk); rate = clk_get_rate(data->dev_clk); clk_m = clk_get_sys(NULL, "clk_m"); if (clk_get_parent(data->dev_clk) != clk_m) { @@ -1478,7 +1478,7 @@ static int tsensor_clk_enable( goto fail; } } else { - clk_disable(data->dev_clk); + clk_disable_unprepare(data->dev_clk); clk_put(data->dev_clk); } fail: |