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

Configure Feed

Select the types of activity you want to include in your feed.

clocksource/drivers/fttmr010: Pass around less pointers

Just pass bool flags from the different initcalls and use the
flags to set the right pointers. This results in less pointers
passed around in init.

Cc: Cédric Le Goater <clg@kaod.org>
Cc: Joel Stanley <joel@jms.id.au>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210724224424.2085404-1-linus.walleij@linaro.org

authored by

Linus Walleij and committed by
Daniel Lezcano 3a95de59 ce957065

+16 -16
+16 -16
drivers/clocksource/timer-fttmr010.c
··· 271 271 } 272 272 273 273 static int __init fttmr010_common_init(struct device_node *np, 274 - bool is_aspeed, 275 - int (*timer_shutdown)(struct clock_event_device *), 276 - irq_handler_t irq_handler) 274 + bool is_aspeed, bool is_ast2600) 277 275 { 278 276 struct fttmr010 *fttmr010; 279 277 int irq; ··· 372 374 fttmr010->tick_rate); 373 375 } 374 376 375 - fttmr010->timer_shutdown = timer_shutdown; 376 - 377 377 /* 378 378 * Setup clockevent timer (interrupt-driven) on timer 1. 379 379 */ ··· 379 383 writel(0, fttmr010->base + TIMER1_LOAD); 380 384 writel(0, fttmr010->base + TIMER1_MATCH1); 381 385 writel(0, fttmr010->base + TIMER1_MATCH2); 382 - ret = request_irq(irq, irq_handler, IRQF_TIMER, 383 - "FTTMR010-TIMER1", &fttmr010->clkevt); 386 + 387 + if (is_ast2600) { 388 + fttmr010->timer_shutdown = ast2600_timer_shutdown; 389 + ret = request_irq(irq, ast2600_timer_interrupt, 390 + IRQF_TIMER, "FTTMR010-TIMER1", 391 + &fttmr010->clkevt); 392 + } else { 393 + fttmr010->timer_shutdown = fttmr010_timer_shutdown; 394 + ret = request_irq(irq, fttmr010_timer_interrupt, 395 + IRQF_TIMER, "FTTMR010-TIMER1", 396 + &fttmr010->clkevt); 397 + } 384 398 if (ret) { 385 399 pr_err("FTTMR010-TIMER1 no IRQ\n"); 386 400 goto out_unmap; ··· 438 432 439 433 static __init int ast2600_timer_init(struct device_node *np) 440 434 { 441 - return fttmr010_common_init(np, true, 442 - ast2600_timer_shutdown, 443 - ast2600_timer_interrupt); 435 + return fttmr010_common_init(np, true, true); 444 436 } 445 437 446 438 static __init int aspeed_timer_init(struct device_node *np) 447 439 { 448 - return fttmr010_common_init(np, true, 449 - fttmr010_timer_shutdown, 450 - fttmr010_timer_interrupt); 440 + return fttmr010_common_init(np, true, false); 451 441 } 452 442 453 443 static __init int fttmr010_timer_init(struct device_node *np) 454 444 { 455 - return fttmr010_common_init(np, false, 456 - fttmr010_timer_shutdown, 457 - fttmr010_timer_interrupt); 445 + return fttmr010_common_init(np, false, false); 458 446 } 459 447 460 448 TIMER_OF_DECLARE(fttmr010, "faraday,fttmr010", fttmr010_timer_init);