diff options
| -rw-r--r-- | target/linux/oxnas/files/drivers/irqchip/irq-rps.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/target/linux/oxnas/files/drivers/irqchip/irq-rps.c b/target/linux/oxnas/files/drivers/irqchip/irq-rps.c index 2c4f688..f2b0829 100644 --- a/target/linux/oxnas/files/drivers/irqchip/irq-rps.c +++ b/target/linux/oxnas/files/drivers/irqchip/irq-rps.c @@ -6,13 +6,7 @@ #include <linux/irqchip/chained_irq.h> #include <linux/err.h> #include <linux/io.h> -#include <linux/version.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) -# include "irqchip.h" -#else -# include <linux/irqchip.h> -#endif +#include <linux/irqchip.h> struct rps_chip_data { void __iomem *base; @@ -62,11 +56,7 @@ static int rps_irq_domain_xlate(struct irq_domain *d, unsigned long *out_hwirq, unsigned int *out_type) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0) - if (d->of_node != controller) -#else if (irq_domain_get_of_node(d) != controller) -#endif return -EINVAL; if (intsize < 1) return -EINVAL; @@ -82,11 +72,7 @@ static int rps_irq_domain_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw) { irq_set_chip_and_handler(irq, &rps_chip, handle_level_irq); -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - set_irq_flags(irq, IRQF_VALID | IRQF_PROBE); -#else irq_set_probe(irq); -#endif irq_set_chip_data(irq, d->host_data); return 0; } @@ -96,11 +82,7 @@ const struct irq_domain_ops rps_irq_domain_ops = { .xlate = rps_irq_domain_xlate, }; -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) -static void rps_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) -#else static void rps_handle_cascade_irq(struct irq_desc *desc) -#endif { struct rps_chip_data *chip_data = irq_desc_get_handler_data(desc); struct irq_chip *chip = irq_desc_get_chip(desc); @@ -114,11 +96,7 @@ static void rps_handle_cascade_irq(struct irq_desc *desc) cascade_irq = irq_find_mapping(chip_data->domain, rps_irq); if (unlikely(rps_irq >= RPS_IRQ_COUNT)) -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - handle_bad_irq(cascade_irq, desc); -#else handle_bad_irq(desc); -#endif else generic_handle_irq(cascade_irq); |