diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-08 09:51:41 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-08 09:51:41 +0900 |
| commit | 65670a1b75874cf36c81456f2fb1e5ef6c6c0a55 (patch) | |
| tree | 48aa7cfb7a6a5521727a272d7dcfdc7083966513 /drivers/clocksource/sh_tmu.c | |
| parent | 151f52f09c5728ecfdd0c289da1a4b30bb416f2c (diff) | |
| parent | 2f6ba5792ce9e4a731baeb976ccc72e0cf43d20b (diff) | |
Merge branch 'rmobile/core' into rmobile-fixes-for-linus
Diffstat (limited to 'drivers/clocksource/sh_tmu.c')
| -rw-r--r-- | drivers/clocksource/sh_tmu.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index de715901b82..36aba992306 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c @@ -393,13 +393,9 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) /* get hold of clock */ p->clk = clk_get(&p->pdev->dev, "tmu_fck"); if (IS_ERR(p->clk)) { - dev_warn(&p->pdev->dev, "using deprecated clock lookup\n"); - p->clk = clk_get(&p->pdev->dev, cfg->clk); - if (IS_ERR(p->clk)) { - dev_err(&p->pdev->dev, "cannot get clock\n"); - ret = PTR_ERR(p->clk); - goto err1; - } + dev_err(&p->pdev->dev, "cannot get clock\n"); + ret = PTR_ERR(p->clk); + goto err1; } return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev), |