Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oxnas: drop compatibility with old kernels from irq-rps

Browse source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2016-05-20 05:37:53 +02:00
parent 53a9809080
commit f90f379a7f
1 changed files with 1 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
target/linux/oxnas/files/drivers/irqchip/irq-rps.c
View file

@ -6,13 +6,7 @@
#include <linux/irqchip/chained_irq.h> #include <linux/irqchip/chained_irq.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/io.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> #include <linux/irqchip.h>
#endif
struct rps_chip_data { struct rps_chip_data {
void __iomem *base; void __iomem *base;
@ -62,11 +56,7 @@ static int rps_irq_domain_xlate(struct irq_domain *d,
unsigned long *out_hwirq, unsigned long *out_hwirq,
unsigned int *out_type) 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) if (irq_domain_get_of_node(d) != controller)
#endif
return -EINVAL; return -EINVAL;
if (intsize < 1) if (intsize < 1)
return -EINVAL; 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_hw_number_t hw)
{ {
irq_set_chip_and_handler(irq, &rps_chip, handle_level_irq); 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); irq_set_probe(irq);
#endif
irq_set_chip_data(irq, d->host_data); irq_set_chip_data(irq, d->host_data);
return 0; return 0;
} }
@ -96,11 +82,7 @@ const struct irq_domain_ops rps_irq_domain_ops = {
.xlate = rps_irq_domain_xlate, .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) static void rps_handle_cascade_irq(struct irq_desc *desc)
#endif
{ {
struct rps_chip_data *chip_data = irq_desc_get_handler_data(desc); struct rps_chip_data *chip_data = irq_desc_get_handler_data(desc);
struct irq_chip *chip = irq_desc_get_chip(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); cascade_irq = irq_find_mapping(chip_data->domain, rps_irq);
if (unlikely(rps_irq >= RPS_IRQ_COUNT)) 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); handle_bad_irq(desc);
#endif
else else
generic_handle_irq(cascade_irq); generic_handle_irq(cascade_irq);