Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1308115 > unrolled thread
| Started by | Milo Kim <milo.kim@ti.com> |
|---|---|
| First post | 2016-01-13 08:20 +0100 |
| Last post | 2016-01-13 08:40 +0100 |
| Articles | 2 — 1 participant |
Back to article view | Back to linux.kernel
[PATCH 1/4] irqchip: atmel-aic: Handle aic_common_irq_fixup in aic_common_of_init Milo Kim <milo.kim@ti.com> - 2016-01-13 08:20 +0100
Re: [PATCH 1/4] irqchip: atmel-aic: Handle aic_common_irq_fixup in aic_common_of_init Milo Kim <milo.kim@ti.com> - 2016-01-13 08:40 +0100
| From | Milo Kim <milo.kim@ti.com> |
|---|---|
| Date | 2016-01-13 08:20 +0100 |
| Subject | [PATCH 1/4] irqchip: atmel-aic: Handle aic_common_irq_fixup in aic_common_of_init |
| Message-ID | <qQnSO-4FD-21@gated-at.bofh.it> |
AIC IRQ fixup is handled in each IRQ chip driver.
It can be moved into aic_common_of_init() before returning the result.
Then, aic_common_irq_fixup() can be changed to static type.
Signed-off-by: Milo Kim <milo.kim@ti.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
Cc: Nicholas Ferre <nicolas.ferre@atmel.com>
Cc: linux-kernel@vger.kernel.org
---
drivers/irqchip/irq-atmel-aic-common.c | 6 ++++--
drivers/irqchip/irq-atmel-aic-common.h | 5 ++---
drivers/irqchip/irq-atmel-aic.c | 4 +---
drivers/irqchip/irq-atmel-aic5.c | 4 +---
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
index b12a5d5..2f2d73e 100644
--- a/drivers/irqchip/irq-atmel-aic-common.c
+++ b/drivers/irqchip/irq-atmel-aic-common.c
@@ -193,7 +193,7 @@ void __init aic_common_rtt_irq_fixup(struct device_node *root)
}
}
-void __init aic_common_irq_fixup(const struct of_device_id *matches)
+static void __init aic_common_irq_fixup(const struct of_device_id *matches)
{
struct device_node *root = of_find_node_by_path("/");
const struct of_device_id *match;
@@ -214,7 +214,8 @@ void __init aic_common_irq_fixup(const struct of_device_id *matches)
struct irq_domain *__init aic_common_of_init(struct device_node *node,
const struct irq_domain_ops *ops,
- const char *name, int nirqs)
+ const char *name, int nirqs,
+ const struct of_device_id *matches)
{
struct irq_chip_generic *gc;
struct irq_domain *domain;
@@ -264,6 +265,7 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
}
aic_common_ext_irq_of_init(domain);
+ aic_common_irq_fixup(matches);
return domain;
diff --git a/drivers/irqchip/irq-atmel-aic-common.h b/drivers/irqchip/irq-atmel-aic-common.h
index 603f0a9..046bcc8 100644
--- a/drivers/irqchip/irq-atmel-aic-common.h
+++ b/drivers/irqchip/irq-atmel-aic-common.h
@@ -30,12 +30,11 @@ int aic_common_irq_domain_xlate(struct irq_domain *d,
struct irq_domain *__init aic_common_of_init(struct device_node *node,
const struct irq_domain_ops *ops,
- const char *name, int nirqs);
+ const char *name, int nirqs,
+ const struct of_device_id *matches);
void __init aic_common_rtc_irq_fixup(struct device_node *root);
void __init aic_common_rtt_irq_fixup(struct device_node *root);
-void __init aic_common_irq_fixup(const struct of_device_id *matches);
-
#endif /* __IRQ_ATMEL_AIC_COMMON_H */
diff --git a/drivers/irqchip/irq-atmel-aic.c b/drivers/irqchip/irq-atmel-aic.c
index 8a0c7f2..799834d 100644
--- a/drivers/irqchip/irq-atmel-aic.c
+++ b/drivers/irqchip/irq-atmel-aic.c
@@ -248,12 +248,10 @@ static int __init aic_of_init(struct device_node *node,
return -EEXIST;
domain = aic_common_of_init(node, &aic_irq_ops, "atmel-aic",
- NR_AIC_IRQS);
+ NR_AIC_IRQS, aic_irq_fixups);
if (IS_ERR(domain))
return PTR_ERR(domain);
- aic_common_irq_fixup(aic_irq_fixups);
-
aic_domain = domain;
gc = irq_get_domain_generic_chip(domain, 0);
diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c
index 62bb840..a7e8fc8 100644
--- a/drivers/irqchip/irq-atmel-aic5.c
+++ b/drivers/irqchip/irq-atmel-aic5.c
@@ -312,12 +312,10 @@ static int __init aic5_of_init(struct device_node *node,
return -EEXIST;
domain = aic_common_of_init(node, &aic5_irq_ops, "atmel-aic5",
- nirqs);
+ nirqs, aic5_irq_fixups);
if (IS_ERR(domain))
return PTR_ERR(domain);
- aic_common_irq_fixup(aic5_irq_fixups);
-
aic5_domain = domain;
nchips = aic5_domain->revmap_size / 32;
for (i = 0; i < nchips; i++) {
--
2.7.0
[toc] | [next] | [standalone]
| From | Milo Kim <milo.kim@ti.com> |
|---|---|
| Date | 2016-01-13 08:40 +0100 |
| Subject | Re: [PATCH 1/4] irqchip: atmel-aic: Handle aic_common_irq_fixup in aic_common_of_init |
| Message-ID | <qQoc9-4Nw-5@gated-at.bofh.it> |
| In reply to | #1308115 |
My apologies - the first patch was sent twice. Please check the complete
patch-set.
- Milo
On 01/13/2016 04:17 PM, Milo Kim wrote:
> AIC IRQ fixup is handled in each IRQ chip driver.
> It can be moved into aic_common_of_init() before returning the result.
> Then, aic_common_irq_fixup() can be changed to static type.
>
> Signed-off-by: Milo Kim <milo.kim@ti.com>
> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Marc Zyngier <marc.zyngier@arm.com>
> Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
> Cc: Nicholas Ferre <nicolas.ferre@atmel.com>
> Cc: linux-kernel@vger.kernel.org
> ---
> drivers/irqchip/irq-atmel-aic-common.c | 6 ++++--
> drivers/irqchip/irq-atmel-aic-common.h | 5 ++---
> drivers/irqchip/irq-atmel-aic.c | 4 +---
> drivers/irqchip/irq-atmel-aic5.c | 4 +---
> 4 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/irqchip/irq-atmel-aic-common.c b/drivers/irqchip/irq-atmel-aic-common.c
> index b12a5d5..2f2d73e 100644
> --- a/drivers/irqchip/irq-atmel-aic-common.c
> +++ b/drivers/irqchip/irq-atmel-aic-common.c
> @@ -193,7 +193,7 @@ void __init aic_common_rtt_irq_fixup(struct device_node *root)
> }
> }
>
> -void __init aic_common_irq_fixup(const struct of_device_id *matches)
> +static void __init aic_common_irq_fixup(const struct of_device_id *matches)
> {
> struct device_node *root = of_find_node_by_path("/");
> const struct of_device_id *match;
> @@ -214,7 +214,8 @@ void __init aic_common_irq_fixup(const struct of_device_id *matches)
>
> struct irq_domain *__init aic_common_of_init(struct device_node *node,
> const struct irq_domain_ops *ops,
> - const char *name, int nirqs)
> + const char *name, int nirqs,
> + const struct of_device_id *matches)
> {
> struct irq_chip_generic *gc;
> struct irq_domain *domain;
> @@ -264,6 +265,7 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
> }
>
> aic_common_ext_irq_of_init(domain);
> + aic_common_irq_fixup(matches);
>
> return domain;
>
> diff --git a/drivers/irqchip/irq-atmel-aic-common.h b/drivers/irqchip/irq-atmel-aic-common.h
> index 603f0a9..046bcc8 100644
> --- a/drivers/irqchip/irq-atmel-aic-common.h
> +++ b/drivers/irqchip/irq-atmel-aic-common.h
> @@ -30,12 +30,11 @@ int aic_common_irq_domain_xlate(struct irq_domain *d,
>
> struct irq_domain *__init aic_common_of_init(struct device_node *node,
> const struct irq_domain_ops *ops,
> - const char *name, int nirqs);
> + const char *name, int nirqs,
> + const struct of_device_id *matches);
>
> void __init aic_common_rtc_irq_fixup(struct device_node *root);
>
> void __init aic_common_rtt_irq_fixup(struct device_node *root);
>
> -void __init aic_common_irq_fixup(const struct of_device_id *matches);
> -
> #endif /* __IRQ_ATMEL_AIC_COMMON_H */
> diff --git a/drivers/irqchip/irq-atmel-aic.c b/drivers/irqchip/irq-atmel-aic.c
> index 8a0c7f2..799834d 100644
> --- a/drivers/irqchip/irq-atmel-aic.c
> +++ b/drivers/irqchip/irq-atmel-aic.c
> @@ -248,12 +248,10 @@ static int __init aic_of_init(struct device_node *node,
> return -EEXIST;
>
> domain = aic_common_of_init(node, &aic_irq_ops, "atmel-aic",
> - NR_AIC_IRQS);
> + NR_AIC_IRQS, aic_irq_fixups);
> if (IS_ERR(domain))
> return PTR_ERR(domain);
>
> - aic_common_irq_fixup(aic_irq_fixups);
> -
> aic_domain = domain;
> gc = irq_get_domain_generic_chip(domain, 0);
>
> diff --git a/drivers/irqchip/irq-atmel-aic5.c b/drivers/irqchip/irq-atmel-aic5.c
> index 62bb840..a7e8fc8 100644
> --- a/drivers/irqchip/irq-atmel-aic5.c
> +++ b/drivers/irqchip/irq-atmel-aic5.c
> @@ -312,12 +312,10 @@ static int __init aic5_of_init(struct device_node *node,
> return -EEXIST;
>
> domain = aic_common_of_init(node, &aic5_irq_ops, "atmel-aic5",
> - nirqs);
> + nirqs, aic5_irq_fixups);
> if (IS_ERR(domain))
> return PTR_ERR(domain);
>
> - aic_common_irq_fixup(aic5_irq_fixups);
> -
> aic5_domain = domain;
> nchips = aic5_domain->revmap_size / 32;
> for (i = 0; i < nchips; i++) {
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web