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()
Unified · Split
| @@ -122,7 +122,7 @@ config XTENSA_VARIANT_CUSTOM_NAME · 121 unmodified lines | ||
| 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 |
| @@ -14,7 +14,6 @@ HOSTFLAGS += -Iarch/$(ARCH)/boot/include · 13 unmodified lines | ||
| 14 | 14 | |
| 15 | 15 | BIG_ENDIAN := $(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#") |
| 16 | 16 | |
| 17 | −export ccflags-y | |
| 18 | 17 | export BIG_ENDIAN |
| 19 | 18 | |
| 20 | 19 | subdir-y := lib |
| @@ -53,16 +53,12 @@ static void system_flush_invalidate_dcache_range(unsigned long start, · 52 unmodified lines | ||
| 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) |
| @@ -128,12 +128,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id) · 127 unmodified lines | ||
| 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); |
| @@ -184,6 +178,8 @@ static inline void calibrate_ccount(void) · 44 unmodified lines | ||
| 184 | 178 | |
| 185 | 179 | void __init time_init(void) |
| 186 | 180 | { |
| 181 | + int irq; | |
| 182 | + | |
| 187 | 183 | of_clk_init(NULL); |
| 188 | 184 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT |
| 189 | 185 | pr_info("Calibrating CPU frequency "); |
| @@ -199,7 +195,9 @@ void __init time_init(void) · 9 unmodified lines | ||
| 199 | 195 | __func__); |
| 200 | 196 | clocksource_register_hz(&ccount_clocksource, ccount_freq); |
| 201 | 197 | local_timer_setup(0); |
| 202 | − setup_irq(this_cpu_ptr(&ccount_timer)->evt.irq, &timer_irqaction); | |
| 198 | + irq = this_cpu_ptr(&ccount_timer)->evt.irq; | |
| 199 | + if (request_irq(irq, timer_interrupt, IRQF_TIMER, "timer", NULL)) | |
| 200 | + pr_err("Failed to request irq %d (timer)\n", irq); | |
| 203 | 201 | sched_clock_register(ccount_sched_clock_read, 32, ccount_freq); |
| 204 | 202 | timer_probe(); |
| 205 | 203 | } |