diff options
author | Magnus Damm <damm@opensource.se> | 2010-10-13 07:36:38 +0000 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-31 10:40:39 -0400 |
commit | 03ff858c09c81a659b2a90a08826bc0abdbb784c (patch) | |
tree | 82f43197b1030e0faaf0e158e30bf15112757366 /drivers/clocksource/sh_mtu2.c | |
parent | 3985c7ce85039adacdf882904ca096f091d39346 (diff) | |
download | op-kernel-dev-03ff858c09c81a659b2a90a08826bc0abdbb784c.zip op-kernel-dev-03ff858c09c81a659b2a90a08826bc0abdbb784c.tar.gz |
ARM: shmobile: remove sh_timer_config clk member
Now when the SH-Mobile ARM platforms have been converted
to use device name it is possible to remove "clk" from
struct sh_timer_config.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/clocksource/sh_mtu2.c')
-rw-r--r-- | drivers/clocksource/sh_mtu2.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c index ef7a5be..40630cb 100644 --- a/drivers/clocksource/sh_mtu2.c +++ b/drivers/clocksource/sh_mtu2.c @@ -287,13 +287,9 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) /* get hold of clock */ p->clk = clk_get(&p->pdev->dev, "mtu2_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_mtu2_register(p, (char *)dev_name(&p->pdev->dev), |