From cd0f6df927d798920641750ab98c18ea1878b35f Mon Sep 17 00:00:00 2001 From: David Brownell Date: Thu, 13 Mar 2008 09:44:48 -0800 Subject: [PATCH] --- yaml --- r: 91342 b: refs/heads/master c: 3ee08aea72f44a6d176af7a97f3ad0c67bc65a44 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/clocksource/tcb_clksrc.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index d16533d6d0f2..d4deef3a89fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d243f92e48a7913938f48fa9ebea5239168bb11 +refs/heads/master: 3ee08aea72f44a6d176af7a97f3ad0c67bc65a44 diff --git a/trunk/drivers/clocksource/tcb_clksrc.c b/trunk/drivers/clocksource/tcb_clksrc.c index 17facda52605..f450588e5858 100644 --- a/trunk/drivers/clocksource/tcb_clksrc.c +++ b/trunk/drivers/clocksource/tcb_clksrc.c @@ -180,10 +180,8 @@ static struct irqaction tc_irqaction = { .handler = ch2_irq, }; -static void __init setup_clkevents(struct atmel_tc *tc, - struct clk *t0_clk, int clk32k_divisor_idx) +static void __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) { - struct platform_device *pdev = tc->pdev; struct clk *t2_clk = tc->clk[2]; int irq = tc->irq[2]; @@ -205,8 +203,7 @@ static void __init setup_clkevents(struct atmel_tc *tc, #else /* !CONFIG_GENERIC_CLOCKEVENTS */ -static void __init setup_clkevents(struct atmel_tc *tc, - struct clk *t0_clk, int clk32k_divisor_idx) +static void __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) { /* NOTHING */ } @@ -220,7 +217,7 @@ static int __init tcb_clksrc_init(void) struct platform_device *pdev; struct atmel_tc *tc; - struct clk *t0_clk, *t1_clk; + struct clk *t0_clk; u32 rate, divided_rate = 0; int best_divisor_idx = -1; int clk32k_divisor_idx = -1; @@ -298,7 +295,7 @@ static int __init tcb_clksrc_init(void) clocksource_register(&clksrc); /* channel 2: periodic and oneshot timer support */ - setup_clkevents(tc, t0_clk, clk32k_divisor_idx); + setup_clkevents(tc, clk32k_divisor_idx); return 0; }