From nobody Thu Dec 18 19:05:52 2025 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 114C01A00F3; Tue, 30 Jul 2024 11:40:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722339608; cv=none; b=OgElf7tUh2LEAv1qtCdAUB1NyeHMIJcaRWYAvSN4oA43kcHWXwAxDq8xteb1kEfZkQz0g3rDwNshlOnrwj1VFI1pO0iR6+vs3kK6VM4EC9efstR7yf8m5NFiKxGZLDLdULLBuy7mP8UbyG1scZycx4XjWV4FlrZZy4FdC9P/au4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722339608; c=relaxed/simple; bh=rZclpVn/tuWnS9ik1F4fupAJtYcEQ7p9loKl/zigG68=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=Hy7bQxMzryl6L/KvepZkwitgOXljkTeVLgoXNrBzIg1ZMpFx4+iLbwCOFmpYeSfrsA6xWv/Grp/sz6V/72skEsVMypC0gNzPpmdVDwaI9dHompOUBqGi8ZNf/c/6jfaDlLMVEBtXZpNqh9y08fmJvsK29hbNJbpSEcJ2bduxdGs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=EKn02RTF; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=uAylkQnz; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="EKn02RTF"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="uAylkQnz" Date: Tue, 30 Jul 2024 11:40:01 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1722339601; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SEZo17G8McebyFdMC8Yhj8q5c67RV0LHan8JgXECF/I=; b=EKn02RTFkjbwmBUCIlfgNVR+qlZ1p/6Md7M6FEuyV8c0EciSu4Za0uSU2Jo3d3ABA1PpX+ tc8l9ymC77MMAOBnKcUHG29zHPJSUSHmiWAIdoEbDHKgDlENUUceq6OYHL4XsUzXvOxWO0 5XFExvBmCbpRfIU2bIqEFCWQeSVQDUd1cr4+p2vWxnJV0veMap/pqmQMpMVii28HOOeDAm D111bnoa9MR7XkjnULeu3QwpAmrmQSNuxKQcKboYzDOFzogidEUHMKo7Qt0qwrfyV8tAFY qafT8s0TRXBiZ3p6K3YpSZCLzswLUp3Z56YbaoigfFwkdeEpqY6GoDEn6Kx3Fw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1722339601; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SEZo17G8McebyFdMC8Yhj8q5c67RV0LHan8JgXECF/I=; b=uAylkQnzKUK0OphB5Rdw8tg4w5EU6C/jPsK3182qIssinsBfU37NWsAt7u8HzTc2OF3IXd nUvUoKiAlTvMrTCA== From: tip-bot2 for Marek =?utf-8?q?Beh=C3=BAn?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] irqchip/armada-370-xp: Improve indentation Cc: kabel@kernel.org, Thomas Gleixner , Andrew Lunn , ilpo.jarvinen@linux.intel.com, x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20240711115748.30268-6-kabel@kernel.org> References: <20240711115748.30268-6-kabel@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <172233960103.2215.10785188821594611760.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the irq/core branch of tip: Commit-ID: 5302e767ebfc1c297bf76f6ef65888249b831a73 Gitweb: https://git.kernel.org/tip/5302e767ebfc1c297bf76f6ef65888249= b831a73 Author: Marek Beh=C3=BAn AuthorDate: Thu, 11 Jul 2024 13:57:43 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 30 Jul 2024 13:35:47 +02:00 irqchip/armada-370-xp: Improve indentation Add some blank lines and other indentation improvements. Checkpatch now stops complaining. Signed-off-by: Marek Beh=C3=BAn Signed-off-by: Thomas Gleixner Reviewed-by: Andrew Lunn Reviewed-by: Ilpo J=C3=A4rvinen Link: https://lore.kernel.org/all/20240711115748.30268-6-kabel@kernel.org --- drivers/irqchip/irq-armada-370-xp.c | 56 +++++++++++++--------------- 1 file changed, 26 insertions(+), 30 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-arma= da-370-xp.c index 316c27c..a66d345 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 =20 static struct irq_chip armada_370_xp_msi_irq_chip =3D { - .name =3D "MPIC MSI", - .irq_mask =3D pci_msi_mask_irq, - .irq_unmask =3D pci_msi_unmask_irq, + .name =3D "MPIC MSI", + .irq_mask =3D pci_msi_mask_irq, + .irq_unmask =3D pci_msi_unmask_irq, }; =20 static struct msi_domain_info armada_370_xp_msi_domain_info =3D { @@ -386,6 +386,7 @@ static struct irq_domain *ipi_domain; static void armada_370_xp_ipi_mask(struct irq_data *d) { u32 reg; + reg =3D readl(per_cpu_int_base + MPIC_IN_DRBEL_MASK); reg &=3D ~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 =3D readl(per_cpu_int_base + MPIC_IN_DRBEL_MASK); reg |=3D BIT(d->hwirq); writel(reg, per_cpu_int_base + MPIC_IN_DRBEL_MASK); @@ -432,24 +434,20 @@ static struct irq_chip ipi_irqchip =3D { .ipi_send_mask =3D armada_370_xp_ipi_send_mask, }; =20 -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 =3D 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); } =20 return 0; } =20 -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 */ } @@ -477,8 +475,7 @@ static __init void armada_xp_ipi_init(struct device_nod= e *node) { int base_ipi; =20 - ipi_domain =3D irq_domain_create_linear(of_node_to_fwnode(node), - IPI_DOORBELL_END, + ipi_domain =3D irq_domain_create_linear(of_node_to_fwnode(node), IPI_DOOR= BELL_END, &ipi_domain_ops, NULL); if (WARN_ON(!ipi_domain)) return; @@ -562,6 +559,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; } =20 @@ -570,6 +568,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 +578,9 @@ static void ipi_resume(void) {} =20 static struct irq_chip armada_370_xp_irq_chip =3D { .name =3D "MPIC", - .irq_mask =3D armada_370_xp_irq_mask, - .irq_mask_ack =3D armada_370_xp_irq_mask, - .irq_unmask =3D armada_370_xp_irq_unmask, + .irq_mask =3D armada_370_xp_irq_mask, + .irq_mask_ack =3D armada_370_xp_irq_mask, + .irq_unmask =3D armada_370_xp_irq_unmask, #ifdef CONFIG_SMP .irq_set_affinity =3D armada_xp_set_affinity, #endif @@ -605,10 +604,9 @@ static int armada_370_xp_mpic_irq_map(struct irq_domai= n *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); + irq_set_chip_and_handler(virq, &armada_370_xp_irq_chip, handle_level_irq= ); irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(virq))); } irq_set_probe(virq); @@ -617,8 +615,8 @@ static int armada_370_xp_mpic_irq_map(struct irq_domain= *h, } =20 static const struct irq_domain_ops armada_370_xp_mpic_irq_ops =3D { - .map =3D armada_370_xp_mpic_irq_map, - .xlate =3D irq_domain_xlate_onecell, + .map =3D armada_370_xp_mpic_irq_map, + .xlate =3D irq_domain_xlate_onecell, }; =20 #ifdef CONFIG_PCI_MSI @@ -705,21 +703,20 @@ armada_370_xp_handle_irq(struct pt_regs *regs) unsigned long ipimask; int ipi; =20 - ipimask =3D readl_relaxed(per_cpu_int_base + - MPIC_IN_DRBEL_CAUSE) - & IPI_DOORBELL_MASK; + ipimask =3D readl_relaxed(per_cpu_int_base + MPIC_IN_DRBEL_CAUSE) & + IPI_DOORBELL_MASK; =20 for_each_set_bit(ipi, &ipimask, IPI_DOORBELL_END) generic_handle_domain_irq(ipi_domain, ipi); } #endif - } while (1); } =20 static int armada_370_xp_mpic_suspend(void) { doorbell_mask_reg =3D readl(per_cpu_int_base + MPIC_IN_DRBEL_MASK); + return 0; } =20 @@ -815,9 +812,8 @@ static int __init armada_370_xp_mpic_of_init(struct dev= ice_node *node, for (int i =3D 0; i < nr_irqs; i++) writel(i, main_int_base + MPIC_INT_CLEAR_ENABLE); =20 - armada_370_xp_mpic_domain =3D - irq_domain_add_linear(node, nr_irqs, - &armada_370_xp_mpic_irq_ops, NULL); + armada_370_xp_mpic_domain =3D 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); =20