Skip to content

Commit

Permalink
ARC: remove @init_time, @init_irq platform callbacks
Browse files Browse the repository at this point in the history
These are not in use for ARC platforms. Moreover DT mechanims exist to
probe them w/o explicit platform calls.

 - clocksource drivers can use CLOCKSOURCE_OF_DECLARE()
 - intc IRQCHIP_DECLARE() calls + cascading inside DT allows external
   intc to be probed automatically

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
  • Loading branch information
Vineet Gupta committed Oct 28, 2015
1 parent e0868e6 commit 4c82f28
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 14 deletions.
6 changes: 0 additions & 6 deletions arch/arc/include/asm/mach_desc.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@
* @dt_compat: Array of device tree 'compatible' strings
* (XXX: although only 1st entry is looked at)
* @init_early: Very early callback [called from setup_arch()]
* @init_irq: setup external IRQ controllers [called from init_IRQ()]
* @init_smp: for each CPU (e.g. setup IPI)
* [(M):init_IRQ(), (o):start_kernel_secondary()]
* @init_time: platform specific clocksource/clockevent registration
* [called from time_init()]
* @init_machine: arch initcall level callback (e.g. populate static
* platform devices or parse Devicetree)
* @init_late: Late initcall level callback
Expand All @@ -36,13 +33,10 @@
struct machine_desc {
const char *name;
const char **dt_compat;

void (*init_early)(void);
void (*init_irq)(void);
#ifdef CONFIG_SMP
void (*init_smp)(unsigned int);
#endif
void (*init_time)(void);
void (*init_machine)(void);
void (*init_late)(void);

Expand Down
10 changes: 5 additions & 5 deletions arch/arc/kernel/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
*/
void __init init_IRQ(void)
{
/* Any external intc can be setup here */
if (machine_desc->init_irq)
machine_desc->init_irq();

/* process the entire interrupt tree in one go */
/*
* process the entire interrupt tree in one go
* Any external intc will be setup provided DT chains them
* properly
*/
irqchip_init();

#ifdef CONFIG_SMP
Expand Down
3 changes: 0 additions & 3 deletions arch/arc/kernel/time.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,4 @@ void __init time_init(void)

/* sets up the periodic event timer */
arc_local_timer_setup();

if (machine_desc->init_time)
machine_desc->init_time();
}

0 comments on commit 4c82f28

Please sign in to comment.