Skip to content

Commit

Permalink
TWL4030: fix clk API usage
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King authored and Russell King committed Jan 13, 2009
1 parent a04b9f8 commit e6b50c8
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/mfd/twl4030-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 "
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e6b50c8

Please sign in to comment.