From owner-dev-commits-src-all@freebsd.org Thu Jul 8 06:58:27 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4800E664707; Thu, 8 Jul 2021 06:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GL6ZW1Nlmz3MtD; Thu, 8 Jul 2021 06:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 17FF01C6A9; Thu, 8 Jul 2021 06:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1686wRf3016204; Thu, 8 Jul 2021 06:58:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1686wQrP016203; Thu, 8 Jul 2021 06:58:26 GMT (envelope-from git) Date: Thu, 8 Jul 2021 06:58:26 GMT Message-Id: <202107080658.1686wQrP016203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: e88c3b1b02a6 - main - intrng: remove now redundant shadow variable. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e88c3b1b02a663f18f51167f54a50e7b4f0eca02 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jul 2021 06:58:27 -0000 The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=e88c3b1b02a663f18f51167f54a50e7b4f0eca02 commit e88c3b1b02a663f18f51167f54a50e7b4f0eca02 Author: Michal Meloun AuthorDate: 2021-07-02 18:28:25 +0000 Commit: Michal Meloun CommitDate: 2021-07-08 06:46:41 +0000 intrng: remove now redundant shadow variable. Should not be a functional change. Submitted by: ehem_freebsd@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); }