diff options
| author | David Brownell <david-b@pacbell.net> | 2008-03-13 13:44:48 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2008-03-13 17:53:29 -0400 |
| commit | 3ee08aea72f44a6d176af7a97f3ad0c67bc65a44 (patch) | |
| tree | d3b3d1eafc62516b85184984b7faa002d9f9e0d5 /drivers/clocksource | |
| parent | 4d243f92e48a7913938f48fa9ebea5239168bb11 (diff) | |
tclib: Fix compile warnings
Does that have something analagous to this "remove warnings" patch?
Seems setup_clkevents() no longer needs a t0_clk parameter either...
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/tcb_clksrc.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c index 17facda52605..f450588e5858 100644 --- a/drivers/clocksource/tcb_clksrc.c +++ b/drivers/clocksource/tcb_clksrc.c | |||
| @@ -180,10 +180,8 @@ static struct irqaction tc_irqaction = { | |||
| 180 | .handler = ch2_irq, | 180 | .handler = ch2_irq, |
| 181 | }; | 181 | }; |
| 182 | 182 | ||
| 183 | static void __init setup_clkevents(struct atmel_tc *tc, | 183 | static void __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) |
| 184 | struct clk *t0_clk, int clk32k_divisor_idx) | ||
| 185 | { | 184 | { |
| 186 | struct platform_device *pdev = tc->pdev; | ||
| 187 | struct clk *t2_clk = tc->clk[2]; | 185 | struct clk *t2_clk = tc->clk[2]; |
| 188 | int irq = tc->irq[2]; | 186 | int irq = tc->irq[2]; |
| 189 | 187 | ||
| @@ -205,8 +203,7 @@ static void __init setup_clkevents(struct atmel_tc *tc, | |||
| 205 | 203 | ||
| 206 | #else /* !CONFIG_GENERIC_CLOCKEVENTS */ | 204 | #else /* !CONFIG_GENERIC_CLOCKEVENTS */ |
| 207 | 205 | ||
| 208 | static void __init setup_clkevents(struct atmel_tc *tc, | 206 | static void __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx) |
| 209 | struct clk *t0_clk, int clk32k_divisor_idx) | ||
| 210 | { | 207 | { |
| 211 | /* NOTHING */ | 208 | /* NOTHING */ |
| 212 | } | 209 | } |
| @@ -220,7 +217,7 @@ static int __init tcb_clksrc_init(void) | |||
| 220 | 217 | ||
| 221 | struct platform_device *pdev; | 218 | struct platform_device *pdev; |
| 222 | struct atmel_tc *tc; | 219 | struct atmel_tc *tc; |
| 223 | struct clk *t0_clk, *t1_clk; | 220 | struct clk *t0_clk; |
| 224 | u32 rate, divided_rate = 0; | 221 | u32 rate, divided_rate = 0; |
| 225 | int best_divisor_idx = -1; | 222 | int best_divisor_idx = -1; |
| 226 | int clk32k_divisor_idx = -1; | 223 | int clk32k_divisor_idx = -1; |
| @@ -298,7 +295,7 @@ static int __init tcb_clksrc_init(void) | |||
| 298 | clocksource_register(&clksrc); | 295 | clocksource_register(&clksrc); |
| 299 | 296 | ||
| 300 | /* channel 2: periodic and oneshot timer support */ | 297 | /* channel 2: periodic and oneshot timer support */ |
| 301 | setup_clkevents(tc, t0_clk, clk32k_divisor_idx); | 298 | setup_clkevents(tc, clk32k_divisor_idx); |
| 302 | 299 | ||
| 303 | return 0; | 300 | return 0; |
| 304 | } | 301 | } |
