Skip to content

Commit

Permalink
[ARM] Fix Integrator IM/PD-1 support
Browse files Browse the repository at this point in the history
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King authored and Russell King committed Oct 21, 2005
1 parent 7fe8785 commit d185663
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions arch/arm/mach-integrator/impd1.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static void impd1_setvco(struct clk *clk, struct icst525_vco vco)
}
writel(0, impd1->base + IMPD1_LOCK);

#if DEBUG
#ifdef DEBUG
vco.v = val & 0x1ff;
vco.r = (val >> 9) & 0x7f;
vco.s = (val >> 16) & 7;
Expand Down Expand Up @@ -427,17 +427,18 @@ static int impd1_probe(struct lm_device *dev)
return ret;
}

static int impd1_remove_one(struct device *dev, void *data)
{
device_unregister(dev);
return 0;
}

static void impd1_remove(struct lm_device *dev)
{
struct impd1_module *impd1 = lm_get_drvdata(dev);
struct list_head *l, *n;
int i;

list_for_each_safe(l, n, &dev->dev.children) {
struct device *d = list_to_dev(l);

device_unregister(d);
}
device_for_each_child(&dev->dev, NULL, impd1_remove_one);

for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++)
clk_unregister(&impd1->vcos[i]);
Expand Down

0 comments on commit d185663

Please sign in to comment.