[v3] Reduce the scope of 'nr_irqs'

[PATCH v3 04/22] powerpc/cell: Switch to irq_get_nr_irqs()

Posted by Bart Van Assche 1 month, 1 week ago

Use the irq_get_nr_irqs() function instead of the global variable
'nr_irqs'. Prepare for changing 'nr_irqs' from an exported global
variable into a variable with file scope.

Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---
 arch/powerpc/platforms/cell/axon_msi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 28dc86744cac..d243f7fd8982 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -112,7 +112,7 @@ static void axon_msi_cascade(struct irq_desc *desc)
 		pr_devel("axon_msi: woff %x roff %x msi %x\n",
 			  write_offset, msic->read_offset, msi);
 
-		if (msi < nr_irqs && irq_get_chip_data(msi) == msic) {
+		if (msi < irq_get_nr_irqs() && irq_get_chip_data(msi) == msic) {
 			generic_handle_irq(msi);
 			msic->fifo_virt[idx] = cpu_to_le32(0xffffffff);
 		} else {

Re: [PATCH v3 04/22] powerpc/cell: Switch to irq_get_nr_irqs()

Posted by Michael Ellerman 1 month, 1 week ago

Bart Van Assche <bvanassche@acm.org> writes:
> Use the irq_get_nr_irqs() function instead of the global variable
> 'nr_irqs'. Prepare for changing 'nr_irqs' from an exported global
> variable into a variable with file scope.
>
> Cc: linuxppc-dev@lists.ozlabs.org
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>
> ---
>  arch/powerpc/platforms/cell/axon_msi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)

cheers

> diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
> index 28dc86744cac..d243f7fd8982 100644
> --- a/arch/powerpc/platforms/cell/axon_msi.c
> +++ b/arch/powerpc/platforms/cell/axon_msi.c
> @@ -112,7 +112,7 @@ static void axon_msi_cascade(struct irq_desc *desc)
>  		pr_devel("axon_msi: woff %x roff %x msi %x\n",
>  			  write_offset, msic->read_offset, msi);
>  
> -		if (msi < nr_irqs && irq_get_chip_data(msi) == msic) {
> +		if (msi < irq_get_nr_irqs() && irq_get_chip_data(msi) == msic) {
>  			generic_handle_irq(msi);
>  			msic->fifo_virt[idx] = cpu_to_le32(0xffffffff);
>  		} else {

[tip: irq/core] powerpc/cell: Switch to irq_get_nr_irqs()

Posted by tip-bot2 for Bart Van Assche 1 month, 1 week ago

The following commit has been merged into the irq/core branch of tip:

Commit-ID:     29f42eb1a3cbaa48c6fae1e36d97162e1f6ab1ae
Gitweb:        https://git.kernel.org/tip/29f42eb1a3cbaa48c6fae1e36d97162e1f6ab1ae
Author:        Bart Van Assche <bvanassche@acm.org>
AuthorDate:    Tue, 15 Oct 2024 12:09:35 -07:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 16 Oct 2024 21:56:57 +02:00

powerpc/cell: Switch to irq_get_nr_irqs()

Use the irq_get_nr_irqs() function instead of the global variable
'nr_irqs'. Prepare for changing 'nr_irqs' from an exported global
variable into a variable with file scope.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Link: https://lore.kernel.org/all/20241015190953.1266194-5-bvanassche@acm.org

---
 arch/powerpc/platforms/cell/axon_msi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 28dc867..d243f7f 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -112,7 +112,7 @@ static void axon_msi_cascade(struct irq_desc *desc)
 		pr_devel("axon_msi: woff %x roff %x msi %x\n",
 			  write_offset, msic->read_offset, msi);
 
-		if (msi < nr_irqs && irq_get_chip_data(msi) == msic) {
+		if (msi < irq_get_nr_irqs() && irq_get_chip_data(msi) == msic) {
 			generic_handle_irq(msi);
 			msic->fifo_virt[idx] = cpu_to_le32(0xffffffff);
 		} else {