Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03ff858c authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

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: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 3985c7ce

drivers/clocksource/sh_cmt.c

+3 −7
Original line number Diff line number Diff line
@@ -615,15 +615,11 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) 


	/* get hold of clock */

	p->clk = clk_get(&p->pdev->dev, "cmt_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;

	}

	}



	if (resource_size(res) == 6) {

		p->width = 16;

drivers/clocksource/sh_mtu2.c

+3 −7
Original line number Diff line number Diff line
@@ -286,15 +286,11 @@ 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;

	}

	}



	return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),

				cfg->clockevent_rating);

drivers/clocksource/sh_tmu.c

+3 −7
Original line number Diff line number Diff line
@@ -392,15 +392,11 @@ 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;

	}

	}



	return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),

			       cfg->clockevent_rating,

include/linux/sh_timer.h

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ struct sh_timer_config { 
	char *name;

	long channel_offset;

	int timer_bit;

	char *clk;

	unsigned long clockevent_rating;

	unsigned long clocksource_rating;

};