Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Magnus Damm and committed by
Paul Mundt
03ff858c 3985c7ce

+9 -22
+3 -7
drivers/clocksource/sh_cmt.c
··· 616 616 /* get hold of clock */ 617 617 p->clk = clk_get(&p->pdev->dev, "cmt_fck"); 618 618 if (IS_ERR(p->clk)) { 619 - dev_warn(&p->pdev->dev, "using deprecated clock lookup\n"); 620 - p->clk = clk_get(&p->pdev->dev, cfg->clk); 621 - if (IS_ERR(p->clk)) { 622 - dev_err(&p->pdev->dev, "cannot get clock\n"); 623 - ret = PTR_ERR(p->clk); 624 - goto err1; 625 - } 619 + dev_err(&p->pdev->dev, "cannot get clock\n"); 620 + ret = PTR_ERR(p->clk); 621 + goto err1; 626 622 } 627 623 628 624 if (resource_size(res) == 6) {
+3 -7
drivers/clocksource/sh_mtu2.c
··· 287 287 /* get hold of clock */ 288 288 p->clk = clk_get(&p->pdev->dev, "mtu2_fck"); 289 289 if (IS_ERR(p->clk)) { 290 - dev_warn(&p->pdev->dev, "using deprecated clock lookup\n"); 291 - p->clk = clk_get(&p->pdev->dev, cfg->clk); 292 - if (IS_ERR(p->clk)) { 293 - dev_err(&p->pdev->dev, "cannot get clock\n"); 294 - ret = PTR_ERR(p->clk); 295 - goto err1; 296 - } 290 + dev_err(&p->pdev->dev, "cannot get clock\n"); 291 + ret = PTR_ERR(p->clk); 292 + goto err1; 297 293 } 298 294 299 295 return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),
+3 -7
drivers/clocksource/sh_tmu.c
··· 393 393 /* get hold of clock */ 394 394 p->clk = clk_get(&p->pdev->dev, "tmu_fck"); 395 395 if (IS_ERR(p->clk)) { 396 - dev_warn(&p->pdev->dev, "using deprecated clock lookup\n"); 397 - p->clk = clk_get(&p->pdev->dev, cfg->clk); 398 - if (IS_ERR(p->clk)) { 399 - dev_err(&p->pdev->dev, "cannot get clock\n"); 400 - ret = PTR_ERR(p->clk); 401 - goto err1; 402 - } 396 + dev_err(&p->pdev->dev, "cannot get clock\n"); 397 + ret = PTR_ERR(p->clk); 398 + goto err1; 403 399 } 404 400 405 401 return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),
-1
include/linux/sh_timer.h
··· 5 5 char *name; 6 6 long channel_offset; 7 7 int timer_bit; 8 - char *clk; 9 8 unsigned long clockevent_rating; 10 9 unsigned long clocksource_rating; 11 10 };