diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2011-06-09 15:30:35 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:42:45 -0800 |
| commit | a70b5b9eafb0c10012f8cf2fcf22b9b87f0004ca (patch) | |
| tree | 51a048ebc812391d997937a65c11d0d79feea364 /arch/arm/mach-tegra/clock.c | |
| parent | 1ad210a42c743b29c9e0c8f128d97357758a98b0 (diff) | |
FIXUP: clock lock/unlock flags
Rebase-Id: R5cefc3b6d35fad4b52e50bd96e2ffae1212e31b8
Diffstat (limited to 'arch/arm/mach-tegra/clock.c')
| -rw-r--r-- | arch/arm/mach-tegra/clock.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c index e4670aad76c9..42258c505fb3 100644 --- a/arch/arm/mach-tegra/clock.c +++ b/arch/arm/mach-tegra/clock.c @@ -514,13 +514,13 @@ static int tegra_clk_clip_rate_for_parent(struct clk *c, struct clk *p) { unsigned long flags, max_rate, old_rate, new_rate; - clk_lock_save(c, flags); + clk_lock_save(c, &flags); max_rate = clk_get_max_rate(c); new_rate = clk_predict_rate_from_parent(c, p); old_rate = clk_get_rate_locked(c); - clk_unlock_restore(c, flags); + clk_unlock_restore(c, &flags); if (new_rate > max_rate) { u64 rate = max_rate; @@ -646,10 +646,10 @@ void __init tegra_init_clock(void) void tegra_sdmmc_tap_delay(struct clk *c, int delay) { unsigned long flags; - clk_lock_save(c, flags); + clk_lock_save(c, &flags); tegra2_sdmmc_tap_delay(c, delay); - clk_unlock_restore(c, flags); + clk_unlock_restore(c, &flags); } #endif @@ -727,7 +727,7 @@ int tegra_clk_cfg_ex(struct clk *c, enum tegra_clk_ex_param p, u32 setting) int ret = 0; unsigned long flags; - clk_lock_save(c, flags); + clk_lock_save(c, &flags); if (!c->ops || !c->ops->clk_cfg_ex) { ret = -ENOSYS; @@ -736,7 +736,7 @@ int tegra_clk_cfg_ex(struct clk *c, enum tegra_clk_ex_param p, u32 setting) ret = c->ops->clk_cfg_ex(c, p, setting); out: - clk_unlock_restore(c, flags); + clk_unlock_restore(c, &flags); return ret; } @@ -1079,10 +1079,10 @@ static int time_on_get(void *data, u64 *val) unsigned long flags; struct clk *c = (struct clk *)data; - clk_lock_save(c, flags); + clk_lock_save(c, &flags); clk_stats_update(c); *val = cputime64_to_clock_t(c->stats.time_on); - clk_unlock_restore(c, flags); + clk_unlock_restore(c, &flags); return 0; } |