diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-01-10 11:40:42 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-01-13 20:39:11 +0100 |
| commit | e6b50c8d58bde1cdc5c9c9520be7ed8921d26aab (patch) | |
| tree | 0995b28e94ef465ca4eae5226aed4e520c9e091a | |
| parent | Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 (diff) | |
| download | linux-e6b50c8d58bde1cdc5c9c9520be7ed8921d26aab.tar.xz linux-e6b50c8d58bde1cdc5c9c9520be7ed8921d26aab.zip | |
TWL4030: fix clk API usage
Always pass a struct device if one is available; and there's really
no reason for the processor specific stuff in this file if only
people would follow the API usage properly by using the struct device.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | drivers/mfd/twl4030-core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index b59c385cbc12..4a488be91ed7 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -646,7 +646,7 @@ static inline int __init unprotect_pm_master(void) return e; } -static void __init clocks_init(void) +static void __init clocks_init(struct device *dev) { int e = 0; struct clk *osc; @@ -655,9 +655,9 @@ static void __init clocks_init(void) #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) if (cpu_is_omap2430()) - osc = clk_get(NULL, "osc_ck"); + osc = clk_get(dev, "osc_ck"); else - osc = clk_get(NULL, "osc_sys_ck"); + osc = clk_get(dev, "osc_sys_ck"); if (IS_ERR(osc)) { printk(KERN_WARNING "Skipping twl4030 internal clock init and " @@ -773,7 +773,7 @@ twl4030_probe(struct i2c_client *client, const struct i2c_device_id *id) inuse = true; /* setup clock framework */ - clocks_init(); + clocks_init(&client->dev); /* Maybe init the T2 Interrupt subsystem */ if (client->irq |