diff options
| author | Sivaram Nair <sivaramn@nvidia.com> | 2012-12-17 18:25:55 +0200 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:49:19 -0700 |
| commit | d54e5d5cd2856611789854ab45b6ac1e78d2be7a (patch) | |
| tree | 36655529683ec7a29e1be6acf08876fb06c9eb2f | |
| parent | 6d3a4fed7253793ed646dc2cc79ec965ea039891 (diff) | |
net: rfkill: 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: I9ccd2a3390f262099ed2059a4ff7d49143a73d99
Signed-off-by: Sivaram Nair <sivaramn@nvidia.com>
Reviewed-on: http://git-master/r/172217
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Rhyland Klein <rklein@nvidia.com>
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
| -rw-r--r-- | net/rfkill/rfkill-gpio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rfkill/rfkill-gpio.c b/net/rfkill/rfkill-gpio.c index fb076cd6f808..d1cc03d211d8 100644 --- a/net/rfkill/rfkill-gpio.c +++ b/net/rfkill/rfkill-gpio.c @@ -57,10 +57,10 @@ static int rfkill_gpio_set_power(void *data, bool blocked) if (gpio_is_valid(rfkill->pdata->reset_gpio)) gpio_direction_output(rfkill->pdata->reset_gpio, 0); if (rfkill->pwr_clk && PWR_CLK_ENABLED(rfkill)) - clk_disable(rfkill->pwr_clk); + clk_disable_unprepare(rfkill->pwr_clk); } else { if (rfkill->pwr_clk && PWR_CLK_DISABLED(rfkill)) - clk_enable(rfkill->pwr_clk); + clk_prepare_enable(rfkill->pwr_clk); if (gpio_is_valid(rfkill->pdata->reset_gpio)) gpio_direction_output(rfkill->pdata->reset_gpio, 1); if (gpio_is_valid(rfkill->pdata->shutdown_gpio)) @@ -204,7 +204,7 @@ static int rfkill_gpio_remove(struct platform_device *pdev) if (gpio_is_valid(rfkill->pdata->reset_gpio)) gpio_free(rfkill->pdata->reset_gpio); if (rfkill->pwr_clk && PWR_CLK_ENABLED(rfkill)) - clk_disable(rfkill->pwr_clk); + clk_disable_unprepare(rfkill->pwr_clk); if (rfkill->pwr_clk) clk_put(rfkill->pwr_clk); kfree(rfkill->shutdown_name); |