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

Commit 50260924 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: mxs: remove now unused timer_clk argument from mxs_timer_init 



With old mxs clock support removed, the timer_clk argument of
mxs_timer_init is unused now, so remove it.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 5da301a2

arch/arm/mach-mxs/include/mach/common.h

+1 −3
Original line number Diff line number Diff line
@@ -11,11 +11,9 @@ 
#ifndef __MACH_MXS_COMMON_H__

#define __MACH_MXS_COMMON_H__



struct clk;



extern const u32 *mxs_get_ocotp(void);

extern int mxs_reset_block(void __iomem *);

extern void mxs_timer_init(struct clk *, int);

extern void mxs_timer_init(int);

extern void mxs_restart(char, const char *);

extern int mxs_saif_clkmux_select(unsigned int clkmux);

arch/arm/mach-mxs/timer.c

+7 −7
Original line number Diff line number Diff line
@@ -244,15 +244,15 @@ static int __init mxs_clocksource_init(struct clk *timer_clk) 
	return 0;

}



void __init mxs_timer_init(struct clk *timer_clk, int irq)

void __init mxs_timer_init(int irq)

{

	if (!timer_clk) {

	struct clk *timer_clk;



	timer_clk = clk_get_sys("timrot", NULL);

	if (IS_ERR(timer_clk)) {

		pr_err("%s: failed to get clk\n", __func__);

		return;

	}

	}



	clk_prepare_enable(timer_clk);

drivers/clk/mxs/clk-imx23.c

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int __init mx23_clocks_init(void) 
	for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)

		clk_prepare_enable(clks[clks_init_on[i]]);



	mxs_timer_init(NULL, MX23_INT_TIMER0);

	mxs_timer_init(MX23_INT_TIMER0);



	return 0;

}

drivers/clk/mxs/clk-imx28.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ int __init mx28_clocks_init(void) 
	for (i = 0; i < ARRAY_SIZE(clks_init_on); i++)

		clk_prepare_enable(clks[clks_init_on[i]]);



	mxs_timer_init(NULL, MX28_INT_TIMER0);

	mxs_timer_init(MX28_INT_TIMER0);



	return 0;

}