From: David Daney <[email protected]> There is a mixture of unsigned long and unsigned int being used with hwirq and hwirq_base. Change it so we use unsigned int everywhere.
Signed-off-by: David Daney <[email protected]> --- arch/arm/common/gic.c | 2 +- include/linux/irqdomain.h | 6 +++--- kernel/irq/irqdomain.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index b2dc2dd..171061f 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -625,7 +625,7 @@ static void __init gic_pm_init(struct gic_chip_data *gic) static int gic_irq_domain_dt_translate(struct irq_domain *d, struct device_node *controller, const u32 *intspec, unsigned int intsize, - unsigned long *out_hwirq, unsigned int *out_type) + unsigned int *out_hwirq, unsigned int *out_type) { if (d->of_node != controller) return -EINVAL; diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index 0914a54..16ba5a9 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -31,12 +31,12 @@ struct irq_domain; * the hardware irq number and linux irq type value. */ struct irq_domain_ops { - unsigned int (*to_irq)(struct irq_domain *d, unsigned long hwirq); + unsigned int (*to_irq)(struct irq_domain *d, unsigned int hwirq); #ifdef CONFIG_OF int (*dt_translate)(struct irq_domain *d, struct device_node *node, const u32 *intspec, unsigned int intsize, - unsigned long *out_hwirq, unsigned int *out_type); + unsigned int *out_hwirq, unsigned int *out_type); #endif /* CONFIG_OF */ }; @@ -72,7 +72,7 @@ struct irq_domain { * be overridden if the irq_domain implements a .to_irq() hook. */ static inline unsigned int irq_domain_to_irq(struct irq_domain *d, - unsigned long hwirq) + unsigned int hwirq) { if (d->ops->to_irq) return d->ops->to_irq(d, hwirq); diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 200ce83..7bae422 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -20,7 +20,7 @@ static DEFINE_MUTEX(irq_domain_mutex); void irq_domain_add(struct irq_domain *domain) { struct irq_data *d; - int hwirq, irq; + unsigned int hwirq, irq; /* * This assumes that the irq_domain owner has already allocated @@ -54,7 +54,7 @@ void irq_domain_add(struct irq_domain *domain) void irq_domain_del(struct irq_domain *domain) { struct irq_data *d; - int hwirq, irq; + unsigned int hwirq, irq; mutex_lock(&irq_domain_mutex); list_del(&domain->list); @@ -82,7 +82,7 @@ unsigned int irq_create_of_mapping(struct device_node *controller, const u32 *intspec, unsigned int intsize) { struct irq_domain *domain; - unsigned long hwirq; + unsigned int hwirq; unsigned int irq, type; int rc = -EINVAL; @@ -129,7 +129,7 @@ EXPORT_SYMBOL_GPL(irq_dispose_mapping); int irq_domain_simple_dt_translate(struct irq_domain *d, struct device_node *controller, const u32 *intspec, unsigned int intsize, - unsigned long *out_hwirq, unsigned int *out_type) + unsigned int *out_hwirq, unsigned int *out_type) { if (d->of_node != controller) return -EINVAL; -- 1.7.2.3 _______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
