diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-12-01 13:13:56 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-12-01 13:13:56 +0100 |
| commit | 307991055b0ce65d53dc1eb501c456c10eb36360 (patch) | |
| tree | 71bb9263dc71344e5d7b97ca6d5cf223f1f1a856 /drivers/clocksource/sh_tmu.c | |
| parent | 1198c6d45a1ef5f4f7fdfbf33ef7d270493ec575 (diff) | |
| parent | 9b4320b77bab4031649c484da1c595f39c2e43cd (diff) | |
| download | linux-next-307991055b0ce65d53dc1eb501c456c10eb36360.tar.gz linux-next-307991055b0ce65d53dc1eb501c456c10eb36360.zip | |
Merge branch 'kconfig_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next into kbuild/rc-fixes
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 de715901b82a..36aba9923060 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), |