irqchip/armada-370-xp: Declare iterators in for loop

Where possible, declare iterators in for cycle. This is possible since
kernel uses -std=gnu11.

Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/all/20240708151801.11592-11-kabel@kernel.org

diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 3d15d0bb7605d75e8f58453df74f7e6ae83440cf..22e1a493abae81f93a7f513eea3c697a50c1a441 100644 (file)
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -276,7 +276,7 @@ static struct irq_chip armada_370_xp_msi_bottom_irq_chip = {
 static int armada_370_xp_msi_alloc(struct irq_domain *domain, unsigned int virq,
                                   unsigned int nr_irqs, void *args)
 {
-       int hwirq, i;
+       int hwirq;
 
        mutex_lock(&msi_used_lock);
        hwirq = bitmap_find_free_region(msi_used, msi_doorbell_size(),
@@ -286,7 +286,7 @@ static int armada_370_xp_msi_alloc(struct irq_domain *domain, unsigned int virq,
        if (hwirq < 0)
                return -ENOSPC;
 
-       for (i = 0; i < nr_irqs; i++) {
+       for (int i = 0; i < nr_irqs; i++) {
                irq_domain_set_info(domain, virq + i, hwirq + i,
                                    &armada_370_xp_msi_bottom_irq_chip,
                                    domain->host_data, handle_simple_irq,
@@ -436,9 +436,7 @@ static int armada_370_xp_ipi_alloc(struct irq_domain *d,
                                         unsigned int virq,
                                         unsigned int nr_irqs, void *args)
 {
-       int i;
-
-       for (i = 0; i < nr_irqs; i++) {
+       for (int i = 0; i < nr_irqs; i++) {
                irq_set_percpu_devid(virq + i);
                irq_domain_set_info(d, virq + i, i, &ipi_irqchip,
                                    d->host_data,
@@ -463,9 +461,7 @@ static const struct irq_domain_ops ipi_domain_ops = {
 
 static void ipi_resume(void)
 {
-       int i;
-
-       for (i = 0; i < IPI_DOORBELL_END; i++) {
+       for (int i = 0; i < IPI_DOORBELL_END; i++) {
                int irq;
 
                irq = irq_find_mapping(ipi_domain, i);
@@ -517,12 +513,12 @@ static int armada_xp_set_affinity(struct irq_data *d,
 static void armada_xp_mpic_smp_cpu_init(void)
 {
        u32 control;
-       int nr_irqs, i;
+       int nr_irqs;
 
        control = readl(main_int_base + MPIC_INT_CONTROL);
        nr_irqs = (control >> 2) & 0x3ff;
 
-       for (i = 0; i < nr_irqs; i++)
+       for (int i = 0; i < nr_irqs; i++)
                writel(i, per_cpu_int_base + MPIC_INT_SET_MASK);
 
        if (!is_ipi_available())
@@ -540,10 +536,8 @@ static void armada_xp_mpic_smp_cpu_init(void)
 
 static void armada_xp_mpic_reenable_percpu(void)
 {
-       unsigned int irq;
-
        /* Re-enable per-CPU interrupts that were enabled before suspend */
-       for (irq = 0; irq < MPIC_MAX_PER_CPU_IRQS; irq++) {
+       for (unsigned int irq = 0; irq < MPIC_MAX_PER_CPU_IRQS; irq++) {
                struct irq_data *data;
                int virq;
 
@@ -735,11 +729,10 @@ static void armada_370_xp_mpic_resume(void)
 {
        bool src0, src1;
        int nirqs;
-       irq_hw_number_t irq;
 
        /* Re-enable interrupts */
        nirqs = (readl(main_int_base + MPIC_INT_CONTROL) >> 2) & 0x3ff;
-       for (irq = 0; irq < nirqs; irq++) {
+       for (irq_hw_number_t irq = 0; irq < nirqs; irq++) {
                struct irq_data *data;
                int virq;
 
@@ -797,7 +790,7 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
                                             struct device_node *parent)
 {
        struct resource main_int_res, per_cpu_int_res;
-       int nr_irqs, i;
+       int nr_irqs;
        u32 control;
 
        BUG_ON(of_address_to_resource(node, 0, &main_int_res));
@@ -821,7 +814,7 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
        control = readl(main_int_base + MPIC_INT_CONTROL);
        nr_irqs = (control >> 2) & 0x3ff;
 
-       for (i = 0; i < nr_irqs; i++)
+       for (int i = 0; i < nr_irqs; i++)
                writel(i, main_int_base + MPIC_INT_CLEAR_ENABLE);
 
        armada_370_xp_mpic_domain =