Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235237
b: refs/heads/master
c: bd41ef5
h: refs/heads/master
i:
  235235: 617eef1
v: v3
  • Loading branch information
Colin Cross committed Feb 21, 2011
1 parent cf6d34a commit 3d41a6b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 14133add42928d6759f35f5d94938adf2cda2bb6
refs/heads/master: bd41ef55e88ae03381569e51ad6ff3bab35e7b0e
19 changes: 2 additions & 17 deletions trunk/arch/arm/mach-tegra/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ static void clk_recalculate_rate(struct clk *c)

int clk_reparent(struct clk *c, struct clk *parent)
{
pr_debug("%s: %s\n", __func__, c->name);
c->parent = parent;
list_del(&c->sibling);
list_add_tail(&c->sibling, &parent->children);
Expand All @@ -148,9 +147,8 @@ int clk_reparent(struct clk *c, struct clk *parent)
static void propagate_rate(struct clk *c)
{
struct clk *clkp;
pr_debug("%s: %s\n", __func__, c->name);

list_for_each_entry(clkp, &c->children, sibling) {
pr_debug(" %s\n", clkp->name);
clk_recalculate_rate(clkp);
propagate_rate(clkp);
}
Expand All @@ -160,8 +158,6 @@ void clk_init(struct clk *c)
{
unsigned long flags;

pr_debug("%s: %s\n", __func__, c->name);

spin_lock_irqsave(&clock_lock, flags);

INIT_LIST_HEAD(&c->children);
Expand All @@ -183,7 +179,7 @@ void clk_init(struct clk *c)
int clk_enable_locked(struct clk *c)
{
int ret;
pr_debug("%s: %s\n", __func__, c->name);

if (c->refcnt == 0) {
if (c->parent) {
ret = clk_enable_locked(c->parent);
Expand Down Expand Up @@ -247,7 +243,6 @@ EXPORT_SYMBOL(clk_enable);

void clk_disable_locked(struct clk *c)
{
pr_debug("%s: %s\n", __func__, c->name);
if (c->refcnt == 0) {
WARN(1, "Attempting to disable clock %s with refcnt 0", c->name);
return;
Expand Down Expand Up @@ -298,8 +293,6 @@ int clk_set_parent_locked(struct clk *c, struct clk *parent)
{
int ret;

pr_debug("%s: %s\n", __func__, c->name);

if (!c->ops || !c->ops->set_parent)
return -ENOSYS;

Expand Down Expand Up @@ -359,8 +352,6 @@ int clk_set_rate_cansleep(struct clk *c, unsigned long rate)
int ret = 0;
unsigned long flags;

pr_debug("%s: %s\n", __func__, c->name);

mutex_lock(&dvfs_lock);

if (rate > c->rate)
Expand Down Expand Up @@ -388,8 +379,6 @@ int clk_set_rate(struct clk *c, unsigned long rate)
int ret = 0;
unsigned long flags;

pr_debug("%s: %s\n", __func__, c->name);

if (clk_is_dvfs(c))
BUG();

Expand All @@ -408,8 +397,6 @@ unsigned long clk_get_rate(struct clk *c)

spin_lock_irqsave(&clock_lock, flags);

pr_debug("%s: %s\n", __func__, c->name);

ret = c->rate;

spin_unlock_irqrestore(&clock_lock, flags);
Expand All @@ -419,8 +406,6 @@ EXPORT_SYMBOL(clk_get_rate);

long clk_round_rate(struct clk *c, unsigned long rate)
{
pr_debug("%s: %s\n", __func__, c->name);

if (!c->ops || !c->ops->round_rate)
return -ENOSYS;

Expand Down

0 comments on commit 3d41a6b

Please sign in to comment.