From: "Marek Behún" <kabel@kernel.org>
To: "Andrew Lunn" <andrew@lunn.ch>,
"Gregory Clement" <gregory.clement@bootlin.com>,
"Sebastian Hesselbarth" <sebastian.hesselbarth@gmail.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org, arm@kernel.org,
"Andy Shevchenko" <andy@kernel.org>,
"Hans de Goede" <hdegoede@redhat.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Cc: "Marek Behún" <kabel@kernel.org>
Subject: [PATCH v2 15/30] irqchip/armada-370-xp: Improve indentation
Date: Tue, 2 Jul 2024 13:42:47 +0200 [thread overview]
Message-ID: <20240702114302.22475-16-kabel@kernel.org> (raw)
In-Reply-To: <20240702114302.22475-1-kabel@kernel.org>
Add some blank lines and other indentation improvements.
Checkpatch now stops complaining.
Signed-off-by: Marek Behún <kabel@kernel.org>
---
drivers/irqchip/irq-armada-370-xp.c | 55 +++++++++++++++--------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 316c27c97951..b849a57633c1 100644
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -229,9 +229,9 @@ static void armada_370_xp_irq_unmask(struct irq_data *d)
#ifdef CONFIG_PCI_MSI
static struct irq_chip armada_370_xp_msi_irq_chip = {
- .name = "MPIC MSI",
- .irq_mask = pci_msi_mask_irq,
- .irq_unmask = pci_msi_unmask_irq,
+ .name = "MPIC MSI",
+ .irq_mask = pci_msi_mask_irq,
+ .irq_unmask = pci_msi_unmask_irq,
};
static struct msi_domain_info armada_370_xp_msi_domain_info = {
@@ -386,6 +386,7 @@ static struct irq_domain *ipi_domain;
static void armada_370_xp_ipi_mask(struct irq_data *d)
{
u32 reg;
+
reg = readl(per_cpu_int_base + MPIC_IN_DRBEL_MASK);
reg &= ~BIT(d->hwirq);
writel(reg, per_cpu_int_base + MPIC_IN_DRBEL_MASK);
@@ -394,6 +395,7 @@ static void armada_370_xp_ipi_mask(struct irq_data *d)
static void armada_370_xp_ipi_unmask(struct irq_data *d)
{
u32 reg;
+
reg = readl(per_cpu_int_base + MPIC_IN_DRBEL_MASK);
reg |= BIT(d->hwirq);
writel(reg, per_cpu_int_base + MPIC_IN_DRBEL_MASK);
@@ -432,24 +434,20 @@ static struct irq_chip ipi_irqchip = {
.ipi_send_mask = armada_370_xp_ipi_send_mask,
};
-static int armada_370_xp_ipi_alloc(struct irq_domain *d,
- unsigned int virq,
- unsigned int nr_irqs, void *args)
+static int armada_370_xp_ipi_alloc(struct irq_domain *d, unsigned int virq,
+ unsigned int nr_irqs, void *args)
{
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,
- handle_percpu_devid_irq,
- NULL, NULL);
+ irq_domain_set_info(d, virq + i, i, &ipi_irqchip, d->host_data,
+ handle_percpu_devid_irq, NULL, NULL);
}
return 0;
}
-static void armada_370_xp_ipi_free(struct irq_domain *d,
- unsigned int virq,
- unsigned int nr_irqs)
+static void armada_370_xp_ipi_free(struct irq_domain *d, unsigned int virq,
+ unsigned int nr_irqs)
{
/* Not freeing IPIs */
}
@@ -484,7 +482,8 @@ static __init void armada_xp_ipi_init(struct device_node *node)
return;
irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI);
- base_ipi = irq_domain_alloc_irqs(ipi_domain, IPI_DOORBELL_END, NUMA_NO_NODE, NULL);
+ base_ipi = irq_domain_alloc_irqs(ipi_domain, IPI_DOORBELL_END,
+ NUMA_NO_NODE, NULL);
if (WARN_ON(!base_ipi))
return;
@@ -562,6 +561,7 @@ static int armada_xp_mpic_starting_cpu(unsigned int cpu)
armada_xp_mpic_perf_init();
armada_xp_mpic_smp_cpu_init();
armada_xp_mpic_reenable_percpu();
+
return 0;
}
@@ -570,6 +570,7 @@ static int mpic_cascaded_starting_cpu(unsigned int cpu)
armada_xp_mpic_perf_init();
armada_xp_mpic_reenable_percpu();
enable_percpu_irq(parent_irq, IRQ_TYPE_NONE);
+
return 0;
}
#else
@@ -579,9 +580,9 @@ static void ipi_resume(void) {}
static struct irq_chip armada_370_xp_irq_chip = {
.name = "MPIC",
- .irq_mask = armada_370_xp_irq_mask,
- .irq_mask_ack = armada_370_xp_irq_mask,
- .irq_unmask = armada_370_xp_irq_unmask,
+ .irq_mask = armada_370_xp_irq_mask,
+ .irq_mask_ack = armada_370_xp_irq_mask,
+ .irq_unmask = armada_370_xp_irq_unmask,
#ifdef CONFIG_SMP
.irq_set_affinity = armada_xp_set_affinity,
#endif
@@ -605,10 +606,10 @@ static int armada_370_xp_mpic_irq_map(struct irq_domain *h,
if (is_percpu_irq(hw)) {
irq_set_percpu_devid(virq);
irq_set_chip_and_handler(virq, &armada_370_xp_irq_chip,
- handle_percpu_devid_irq);
+ handle_percpu_devid_irq);
} else {
irq_set_chip_and_handler(virq, &armada_370_xp_irq_chip,
- handle_level_irq);
+ handle_level_irq);
irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(virq)));
}
irq_set_probe(virq);
@@ -617,8 +618,8 @@ static int armada_370_xp_mpic_irq_map(struct irq_domain *h,
}
static const struct irq_domain_ops armada_370_xp_mpic_irq_ops = {
- .map = armada_370_xp_mpic_irq_map,
- .xlate = irq_domain_xlate_onecell,
+ .map = armada_370_xp_mpic_irq_map,
+ .xlate = irq_domain_xlate_onecell,
};
#ifdef CONFIG_PCI_MSI
@@ -706,20 +707,20 @@ armada_370_xp_handle_irq(struct pt_regs *regs)
int ipi;
ipimask = readl_relaxed(per_cpu_int_base +
- MPIC_IN_DRBEL_CAUSE)
- & IPI_DOORBELL_MASK;
+ MPIC_IN_DRBEL_CAUSE) &
+ IPI_DOORBELL_MASK;
for_each_set_bit(ipi, &ipimask, IPI_DOORBELL_END)
generic_handle_domain_irq(ipi_domain, ipi);
}
#endif
-
} while (1);
}
static int armada_370_xp_mpic_suspend(void)
{
doorbell_mask_reg = readl(per_cpu_int_base + MPIC_IN_DRBEL_MASK);
+
return 0;
}
@@ -815,9 +816,9 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
for (int i = 0; i < nr_irqs; i++)
writel(i, main_int_base + MPIC_INT_CLEAR_ENABLE);
- armada_370_xp_mpic_domain =
- irq_domain_add_linear(node, nr_irqs,
- &armada_370_xp_mpic_irq_ops, NULL);
+ armada_370_xp_mpic_domain = irq_domain_add_linear(node, nr_irqs,
+ &armada_370_xp_mpic_irq_ops,
+ NULL);
BUG_ON(!armada_370_xp_mpic_domain);
irq_domain_update_bus_token(armada_370_xp_mpic_domain, DOMAIN_BUS_WIRED);
--
2.44.2
next prev parent reply other threads:[~2024-07-02 11:46 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-02 11:42 [PATCH v2 00/30] armada-370-xp irqchip updates round 2 Marek Behún
2024-07-02 11:42 ` [PATCH v2 01/30] irqchip/armada-370-xp: Drop _OFFS suffix from some register constants Marek Behún
2024-07-02 11:42 ` [PATCH v2 02/30] irqchip/armada-370-xp: Change register constant suffix from _MSK to _MASK Marek Behún
2024-07-02 11:42 ` [PATCH v2 03/30] irqchip/armada-370-xp: Change spaces to tabs Marek Behún
2024-07-02 11:42 ` [PATCH v2 04/30] irqchip/armada-370-xp: Use BIT() and GENMASK() macros Marek Behún
2024-07-02 11:42 ` [PATCH v2 05/30] irqchip/armada-370-xp: Cosmetic fix parentheses in register constant definitions Marek Behún
2024-07-06 9:41 ` Ilpo Järvinen
2024-07-02 11:42 ` [PATCH v2 06/30] irqchip/armada-370-xp: Change register constants prefix to MPIC_ Marek Behún
2024-07-02 11:42 ` [PATCH v2 07/30] irqchip/armada-370-xp: Use correct type for cpu variable Marek Behún
2024-07-02 11:42 ` [PATCH v2 08/30] irqchip/armada-370-xp: Simplify is_percpu_irq() code Marek Behún
2024-07-06 9:42 ` Ilpo Järvinen
2024-07-02 11:42 ` [PATCH v2 09/30] irqchip/armada-370-xp: Change to SPDX license identifier Marek Behún
2024-07-02 11:42 ` [PATCH v2 10/30] irqchip/armada-370-xp: Declare iterators in for loop Marek Behún
2024-07-02 11:42 ` [PATCH v2 11/30] irqchip/armada-370-xp: Rename variable for consistency Marek Behún
2024-07-02 11:42 ` [PATCH v2 12/30] irqchip/armada-370-xp: Use unsigned int type for virqs Marek Behún
2024-07-02 11:42 ` [PATCH v2 13/30] irqchip/armada-370-xp: Use !virq instead of virq == 0 in condition Marek Behún
2024-07-02 11:42 ` [PATCH v2 14/30] irqchip/armada-370-xp: Simplify ipi_resume() code Marek Behún
2024-07-02 11:42 ` Marek Behún [this message]
2024-07-02 11:42 ` [PATCH v2 16/30] irqchip/armada-370-xp: Change symbol prefixes to mpic Marek Behún
2024-07-02 11:42 ` [PATCH v2 17/30] irqchip/armada-370-xp: Don't read number of supported interrupts multiple times Marek Behún
2024-07-02 11:42 ` [PATCH v2 18/30] irqchip/armada-370-xp: Use FIELD_GET() and named register constant Marek Behún
2024-07-02 11:42 ` [PATCH v2 19/30] irqchip/armada-370-xp: Refactor mpic_handle_msi_irq() code Marek Behún
2024-07-02 11:42 ` [PATCH v2 20/30] irqchip/armada-370-xp: Refactor handling IPI interrupts Marek Behún
2024-07-02 11:42 ` [PATCH v2 21/30] irqchip/armada-370-xp: Use consistent variable names for hwirqs Marek Behún
2024-07-02 11:42 ` [PATCH v2 22/30] irqchip/armada-370-xp: Use consistent types when iterating interrupts Marek Behún
2024-07-02 11:42 ` [PATCH v2 23/30] irqchip/armada-370-xp: Use consistent name for struct irq_data variables Marek Behún
2024-07-02 11:42 ` [PATCH v2 24/30] irqchip/armada-370-xp: Simplify mpic_reenable_percpu() and mpic_resume() Marek Behún
2024-07-02 11:42 ` [PATCH v2 25/30] irqchip/armada-370-xp: Drop unneeded curly brackets Marek Behún
2024-07-02 11:42 ` [PATCH v2 26/30] irqchip/armada-370-xp: Drop redundant continue Marek Behún
2024-07-02 11:42 ` [PATCH v2 27/30] irqchip/armada-370-xp: Rename variable for consistency Marek Behún
2024-07-02 11:43 ` [PATCH v2 28/30] irqchip/armada-370-xp: Use u32 type instead of unsigned long where possieble Marek Behún
2024-07-02 11:43 ` [PATCH v2 29/30] irqchip/armada-370-xp: Refactor initial memory regions mapping Marek Behún
2024-07-02 11:43 ` [PATCH v2 30/30] irqchip/armada-370-xp: Print error and return error code on initialization failure Marek Behún
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240702114302.22475-16-kabel@kernel.org \
--to=kabel@kernel.org \
--cc=andrew@lunn.ch \
--cc=andy@kernel.org \
--cc=arm@kernel.org \
--cc=gregory.clement@bootlin.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=sebastian.hesselbarth@gmail.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.