The branch main has been updated by mmel:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=e88c3b1b02a663f18f51167f54a50e7b4f0eca02

commit e88c3b1b02a663f18f51167f54a50e7b4f0eca02
Author:     Michal Meloun <m...@freebsd.org>
AuthorDate: 2021-07-02 18:28:25 +0000
Commit:     Michal Meloun <m...@freebsd.org>
CommitDate: 2021-07-08 06:46:41 +0000

    intrng: remove now redundant shadow variable.
    
    Should not be a functional change.
    
    Submitted by:   ehem_free...@m5p.com
    Discussed in:   https://reviews.freebsd.org/D29310
    MFC after:      4 weeks
---
 sys/kern/subr_intr.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/sys/kern/subr_intr.c b/sys/kern/subr_intr.c
index d4926b2e2364..04636f09c5a1 100644
--- a/sys/kern/subr_intr.c
+++ b/sys/kern/subr_intr.c
@@ -401,15 +401,14 @@ intr_isrc_dispatch(struct intr_irqsrc *isrc, struct 
trapframe *tf)
 static inline int
 isrc_alloc_irq(struct intr_irqsrc *isrc)
 {
-       u_int maxirqs, irq;
+       u_int irq;
 
        mtx_assert(&isrc_table_lock, MA_OWNED);
 
-       maxirqs = intr_nirq;
-       if (irq_next_free >= maxirqs)
+       if (irq_next_free >= intr_nirq)
                return (ENOSPC);
 
-       for (irq = irq_next_free; irq < maxirqs; irq++) {
+       for (irq = irq_next_free; irq < intr_nirq; irq++) {
                if (irq_sources[irq] == NULL)
                        goto found;
        }
@@ -418,7 +417,7 @@ isrc_alloc_irq(struct intr_irqsrc *isrc)
                        goto found;
        }
 
-       irq_next_free = maxirqs;
+       irq_next_free = intr_nirq;
        return (ENOSPC);
 
 found:
@@ -426,7 +425,7 @@ found:
        irq_sources[irq] = isrc;
 
        irq_next_free = irq + 1;
-       if (irq_next_free >= maxirqs)
+       if (irq_next_free >= intr_nirq)
                irq_next_free = 0;
        return (0);
 }
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to