Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: shmobile: remove sh_timer_config clk member

Browse Source 
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>
This commit is contained in:
Magnus Damm 2010-10-13 07:36:38 +00:00 committed by Paul Mundt
parent 3985c7ce85
commit 03ff858c09
4 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/clocksource/sh_cmt.c
View File

@ -616,13 +616,9 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
/* get hold of clock */ /* get hold of clock */
p->clk = clk_get(&p->pdev->dev, "cmt_fck"); p->clk = clk_get(&p->pdev->dev, "cmt_fck");
if (IS_ERR(p->clk)) { if (IS_ERR(p->clk)) {
dev_warn(&p->pdev->dev, "using deprecated clock lookup\n"); dev_err(&p->pdev->dev, "cannot get clock\n");
p->clk = clk_get(&p->pdev->dev, cfg->clk); ret = PTR_ERR(p->clk);
if (IS_ERR(p->clk)) { goto err1;
dev_err(&p->pdev->dev, "cannot get clock\n");
ret = PTR_ERR(p->clk);
goto err1;
}
} }
if (resource_size(res) == 6) { if (resource_size(res) == 6) {

10
drivers/clocksource/sh_mtu2.c
View File

@ -287,13 +287,9 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev)
/* get hold of clock */ /* get hold of clock */
p->clk = clk_get(&p->pdev->dev, "mtu2_fck"); p->clk = clk_get(&p->pdev->dev, "mtu2_fck");
if (IS_ERR(p->clk)) { if (IS_ERR(p->clk)) {
dev_warn(&p->pdev->dev, "using deprecated clock lookup\n"); dev_err(&p->pdev->dev, "cannot get clock\n");
p->clk = clk_get(&p->pdev->dev, cfg->clk); ret = PTR_ERR(p->clk);
if (IS_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), return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),

10
drivers/clocksource/sh_tmu.c
View File

@ -393,13 +393,9 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev)
/* get hold of clock */ /* get hold of clock */
p->clk = clk_get(&p->pdev->dev, "tmu_fck"); p->clk = clk_get(&p->pdev->dev, "tmu_fck");
if (IS_ERR(p->clk)) { if (IS_ERR(p->clk)) {
dev_warn(&p->pdev->dev, "using deprecated clock lookup\n"); dev_err(&p->pdev->dev, "cannot get clock\n");
p->clk = clk_get(&p->pdev->dev, cfg->clk); ret = PTR_ERR(p->clk);
if (IS_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), return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),

1
include/linux/sh_timer.h
View File

@ -5,7 +5,6 @@ struct sh_timer_config {
char *name; char *name;
long channel_offset; long channel_offset;
int timer_bit; int timer_bit;
char *clk;
unsigned long clockevent_rating; unsigned long clockevent_rating;
unsigned long clocksource_rating; unsigned long clocksource_rating;
}; };