[PATCH v3 5/8] genirq: Refactor accessors to use irq_data_get_affinity_mask

From: Samuel Holland <samuel@sholland.org>
To: Marc Zyngier <maz@kernel.org>, Thomas Gleixner <tglx@linutronix.de>
Cc: "Samuel Holland" <samuel@sholland.org>,
	"Andy Shevchenko" <andy.shevchenko@gmail.com>,
	"Bartosz Golaszewski" <brgl@bgdev.pl>,
	"Bjorn Helgaas" <bhelgaas@google.com>,
	"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
	"Borislav Petkov" <bp@alien8.de>,
	"Broadcom internal kernel review list"
	<bcm-kernel-feedback-list@broadcom.com>,
	"Chris Zankel" <chris@zankel.net>,
	"Colin Ian King" <colin.king@intel.com>,
	"Dave Hansen" <dave.hansen@linux.intel.com>,
	"Dexuan Cui" <decui@microsoft.com>,
	"Florian Fainelli" <f.fainelli@gmail.com>,
	"Guo Ren" <guoren@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
	"Haiyang Zhang" <haiyangz@microsoft.com>,
	"Helge Deller" <deller@gmx.de>, "Ingo Molnar" <mingo@redhat.com>,
	"Ivan Kokshaysky" <ink@jurassic.park.msu.ru>,
	"James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>,
	"Jan Beulich" <jbeulich@suse.com>,
	"Joerg Roedel" <joro@8bytes.org>,
	"Juergen Gross" <jgross@suse.com>,
	"Julia Lawall" <Julia.Lawall@inria.fr>,
	"K. Y. Srinivasan" <kys@microsoft.com>,
	"Kees Cook" <keescook@chromium.org>,
	"Krzysztof Wilczyński" <kw@linux.com>,
	"Linus Walleij" <linus.walleij@linaro.org>,
	"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
	"Mark Rutland" <mark.rutland@arm.com>,
	"Matt Turner" <mattst88@gmail.com>,
	"Max Filippov" <jcmvbkbc@gmail.com>,
	"Maximilian Heyne" <mheyne@amazon.de>,
	"Oleksandr Tyshchenko" <oleksandr_tyshchenko@epam.com>,
	"Rich Felker" <dalias@libc.org>,
	"Richard Henderson" <rth@twiddle.net>,
	"Rikard Falkeborn" <rikard.falkeborn@gmail.com>,
	"Rob Herring" <robh@kernel.org>,
	"Russell King" <linux@armlinux.org.uk>,
	"Serge Semin" <fancer.lancer@gmail.com>,
	"Stefano Stabellini" <sstabellini@kernel.org>,
	"Stephen Hemminger" <sthemmin@microsoft.com>,
	"Sven Schnelle" <svens@stackframe.org>,
	"Thomas Bogendoerfer" <tsbogend@alpha.franken.de>,
	"Wei Liu" <wei.liu@kernel.org>, "Wei Xu" <xuwei5@hisilicon.com>,
	"Will Deacon" <will@kernel.org>,
	"Yoshinori Sato" <ysato@users.sourceforge.jp>,
	iommu@lists.linux-foundation.org, iommu@lists.linux.dev,
	linux-alpha@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-hyperv@vger.kernel.org, linux-ia64@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org,
	linux-parisc@vger.kernel.org, linux-pci@vger.kernel.org,
	linux-sh@vger.kernel.org, linux-xtensa@linux-xtensa.org,
	x86@kernel.org, xen-devel@lists.xenproject.org
Subject: [PATCH v3 5/8] genirq: Refactor accessors to use irq_data_get_affinity_mask
Date: Fri,  1 Jul 2022 15:00:53 -0500	[thread overview]
Message-ID: <20220701200056.46555-6-samuel@sholland.org> (raw)
In-Reply-To: <20220701200056.46555-1-samuel@sholland.org>

A couple of functions directly reference the affinity mask. Route them
through irq_data_get_affinity_mask so they will pick up any refactoring
done there.

Signed-off-by: Samuel Holland <samuel@sholland.org>
---

(no changes since v1)

 include/linux/irq.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 505308253d23..69ee4e2f36ce 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -879,16 +879,16 @@ static inline int irq_data_get_node(struct irq_data *d)
 	return irq_common_data_get_node(d->common);
 }
 
-static inline struct cpumask *irq_get_affinity_mask(int irq)
+static inline struct cpumask *irq_data_get_affinity_mask(struct irq_data *d)
 {
-	struct irq_data *d = irq_get_irq_data(irq);
-
-	return d ? d->common->affinity : NULL;
+	return d->common->affinity;
 }
 
-static inline struct cpumask *irq_data_get_affinity_mask(struct irq_data *d)
+static inline struct cpumask *irq_get_affinity_mask(int irq)
 {
-	return d->common->affinity;
+	struct irq_data *d = irq_get_irq_data(irq);
+
+	return d ? irq_data_get_affinity_mask(d) : NULL;
 }
 
 #ifdef CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK
@@ -910,7 +910,7 @@ static inline void irq_data_update_effective_affinity(struct irq_data *d,
 static inline
 struct cpumask *irq_data_get_effective_affinity_mask(struct irq_data *d)
 {
-	return d->common->affinity;
+	return irq_data_get_affinity_mask(d);
 }
 #endif
 
-- 
2.35.1

