From nobody Tue Jun 7 14:23:34 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CE8AB7CAFDF; Tue, 7 Jun 2022 14:23:36 +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 4LHXdz4Szsz3rN3; Tue, 7 Jun 2022 14:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654611815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jv6gfMgv0VL6Zz6SZcDeu2SFVfF99OZ3dUwpsaaUZ+Y=; b=puLfzNjP/7zSxzhNu6v6CjIeGhgbrbODThrjL6dhksmMIifxLZgx2nkDGV5X9VG4Ggqg56 EPINUDuTcNg452H6LcPvgSuooSL8rv9LGI3baU58aQDwmT8ztjj6QMBH5vzaXcVLdn0C6h TyBVypkV3MXY7aiz9ZyueafVNxOKrDNKBjee4z1ZzQ+r3jsQLKAsknnR3uImEV+kbzEt0j Cz/WP7/vYQwCb0WZhh2gk1rD2h7hNFIuhKB3fmGZ9O7LLWXffzXxGKT5Fh9Q9ZNjqm+wIS 8AFy1F+EMKq9nsJOLlNZwtTYRiV5DCOzVwMU6FUUUnVVh/3b25k4hdv3hnKh5w== 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 84C9B1CC04; Tue, 7 Jun 2022 14:23:34 +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 257ENY2T020404; Tue, 7 Jun 2022 14:23:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 257ENYct020403; Tue, 7 Jun 2022 14:23:34 GMT (envelope-from git) Date: Tue, 7 Jun 2022 14:23:34 GMT Message-Id: <202206071423.257ENYct020403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: dfa8e98c8029 - stable/13 - Fix the style of bcm_pcib_msi_attach a little List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dfa8e98c80299e5a939cec4d10aaa47513732d87 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654611815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jv6gfMgv0VL6Zz6SZcDeu2SFVfF99OZ3dUwpsaaUZ+Y=; b=FbUNj5dr/9Li+FWQCMDHgvjObMU/EfZpBlRaAQ2UGtaGSzSBKtEBBewGRi16PbUgt3QFg4 XNokwuFsagz74bDkCCNjegybs0UvOQvmXQQtuFOuWPB+cYGEXmwh00AnsK+75QmI2EjlEC jsexwkRPxQGT0MAU+addxw2imgTBNt45o9z/qHwYz99RJa/rbmG++ZLj5tWf5HHoo7usRX MsNPoXOib3A7yASHBIIyZpnVxL7aBlLbMZGTedUfxoD1O8DGT7WQygpboAtl5Koyesz2oG IiPWqisggmm6RA/7gK16d8hB16mT+RS+xDRKj5rAbMvAKEpuIK9Uiui12wm71A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654611815; a=rsa-sha256; cv=none; b=AjwAp2lCaH3x3J0n7uOVqrb78kBuCxy4Ndc1l5r0bvfcQkC9LWssNCL+z9lZor2thncEat hMY8QmiuLpicjpNeiIShlVsB0H1RpOFhCMwtzdGSSWfR7Nbf5iAqixBpT1NCnIUQ3N925Y fSjGhzOfkGFVb5h0LmTChieqnYmnP6yzEp85joXesqBWAdSticF7HoS108zN/UhE1nocWD TKsi3u/jZeO64IWr2DLts26sQUIy4QaKQJecJd2R/LoczMcQbLfDCNfsig9+9bLCs730Rq AEx2e2QlmG5tTsoVtR1GoXWellI0WG7bCoD8KGv8ov+TWfzHy9o/y8kAX9ECkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=dfa8e98c80299e5a939cec4d10aaa47513732d87 commit dfa8e98c80299e5a939cec4d10aaa47513732d87 Author: Andrew Turner AuthorDate: 2022-05-23 16:33:53 +0000 Commit: Andrew Turner CommitDate: 2022-06-07 14:20:18 +0000 Fix the style of bcm_pcib_msi_attach a little Move the definition of error to the top of the function. Sponsored by: The FreeBSD Foundation (cherry picked from commit b25d7f7477316d185277e4d29da220cc742f6802) --- sys/arm/broadcom/bcm2835/bcm2838_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c index 15111f73ca5e..377cb83ecbe1 100644 --- a/sys/arm/broadcom/bcm2835/bcm2838_pci.c +++ b/sys/arm/broadcom/bcm2835/bcm2838_pci.c @@ -513,7 +513,7 @@ bcm_pcib_msi_attach(device_t dev) struct bcm_pcib_softc *sc; phandle_t node, xref; char const *bcm_name; - int i, rid; + int error, i, rid; sc = device_get_softc(dev); sc->msi_addr = 0xffffffffc; @@ -532,7 +532,7 @@ bcm_pcib_msi_attach(device_t dev) sc->msi_isrcs = malloc(sizeof(*sc->msi_isrcs) * NUM_MSI, M_DEVBUF, M_WAITOK | M_ZERO); - int error = bus_setup_intr(dev, sc->msi_irq_res, INTR_TYPE_BIO | + error = bus_setup_intr(dev, sc->msi_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, bcm_pcib_msi_intr, NULL, sc, &sc->msi_intr_cookie); if (error) { device_printf(dev, "error: failed to setup MSI handler.\n");