Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'xtensa-20200410' of git://github.com/jcmvbkbc/linux-xtensa
Pull xtensa updates from Max Filippov:
- replace setup_irq() by request_irq()
- cosmetic fixes in xtensa Kconfig and boot/Makefile
* tag 'xtensa-20200410' of git://github.com/jcmvbkbc/linux-xtensa:
arch/xtensa: fix grammar in Kconfig help text
xtensa: remove meaningless export ccflags-y
xtensa: replace setup_irq() by request_irq()
+8
-15
+1
-1
arch/xtensa/Kconfig
+1
-1
arch/xtensa/Kconfig
···
122
122
help
123
123
Provide the name of a custom Xtensa processor variant.
124
124
This CORENAME selects arch/xtensa/variant/CORENAME.
125
-
Dont forget you have to select MMU if you have one.
125
+
Don't forget you have to select MMU if you have one.
126
126
127
127
config XTENSA_VARIANT_NAME
128
128
string
-1
arch/xtensa/boot/Makefile
-1
arch/xtensa/boot/Makefile
+2
-6
arch/xtensa/kernel/smp.c
+2
-6
arch/xtensa/kernel/smp.c
···
53
53
#define IPI_IRQ 0
54
54
55
55
static irqreturn_t ipi_interrupt(int irq, void *dev_id);
56
-
static struct irqaction ipi_irqaction = {
57
-
.handler = ipi_interrupt,
58
-
.flags = IRQF_PERCPU,
59
-
.name = "ipi",
60
-
};
61
56
62
57
void ipi_init(void)
63
58
{
64
59
unsigned irq = irq_create_mapping(NULL, IPI_IRQ);
65
-
setup_irq(irq, &ipi_irqaction);
60
+
if (request_irq(irq, ipi_interrupt, IRQF_PERCPU, "ipi", NULL))
61
+
pr_err("Failed to request irq %u (ipi)\n", irq);
66
62
}
67
63
68
64
static inline unsigned int get_core_count(void)
+5
-7
arch/xtensa/kernel/time.c
+5
-7
arch/xtensa/kernel/time.c
···
128
128
return IRQ_HANDLED;
129
129
}
130
130
131
-
static struct irqaction timer_irqaction = {
132
-
.handler = timer_interrupt,
133
-
.flags = IRQF_TIMER,
134
-
.name = "timer",
135
-
};
136
-
137
131
void local_timer_setup(unsigned cpu)
138
132
{
139
133
struct ccount_timer *timer = &per_cpu(ccount_timer, cpu);
···
178
184
179
185
void __init time_init(void)
180
186
{
187
+
int irq;
188
+
181
189
of_clk_init(NULL);
182
190
#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
183
191
pr_info("Calibrating CPU frequency ");
···
195
199
__func__);
196
200
clocksource_register_hz(&ccount_clocksource, ccount_freq);
197
201
local_timer_setup(0);
198
-
setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction);
202
+
irq = this_cpu_ptr(&ccount_timer)->evt.irq;
203
+
if (request_irq(irq, timer_interrupt, IRQF_TIMER, "timer", NULL))
204
+
pr_err("Failed to request irq %d (timer)\n", irq);
199
205
sched_clock_register(ccount_sched_clock_read, 32, ccount_freq);
200
206
timer_probe();
201
207
}