From nobody Mon May 23 16:35:57 2022 X-Original-To: dev-commits-src-main@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 A329B1B350B1; Mon, 23 May 2022 16:35:58 +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 4L6NHf25PJz4tQh; Mon, 23 May 2022 16:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653323758; 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=xtpTA2jrHc+Vh3ZKh2t7oadhQib1kDtBmFsL7rTCPEg=; b=DuPXJckfwpajdLkalUQYiTRSwew2qRKzqrvstYRsz2/sFIUcYH7lXvvmzbs9BWxQA6MiYM snvQVeLiRG8zAxTLTVk43GIUaAft0wNDQQjQM2mf/cun1qAFOMvz3gZSnhpGFfwsssqRPq B4b6Pv+W1Kbk03sdxmsVj8yoUSgB5kB5Kh4g+Ms5Lp9iQr5PlNjIp57QK8fTGXbmYuMVaG em087SrWqIbnfg/Up9e8ITNwF5lESDF8mEd8GjAd7Q+ldCMKZFi5wuAYHSTxu17bMN/yaz GFEnE7tRtqEs18vp0slPKbmUR97I61VctdGGcHTOpSZgTobNefZ85/V8u9tmmA== 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 E9FEA136B7; Mon, 23 May 2022 16:35:57 +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 24NGZvNA039055; Mon, 23 May 2022 16:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NGZv3X039054; Mon, 23 May 2022 16:35:57 GMT (envelope-from git) Date: Mon, 23 May 2022 16:35:57 GMT Message-Id: <202205231635.24NGZv3X039054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b25d7f747731 - main - Fix the style of bcm_pcib_msi_attach a little List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b25d7f7477316d185277e4d29da220cc742f6802 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653323758; 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=xtpTA2jrHc+Vh3ZKh2t7oadhQib1kDtBmFsL7rTCPEg=; b=LQraJj4v97HknM9Dht2N1J1kwJKEpb6Nvo+LWEd630qPrW61GOkngEx+joZWgIe9T5J+7E oGDvTNUMiXXU3BE7nunBPW9viLj+42sTvuQD55uOcve0vifbUDI5Z2Dyf2uaNGBLdMPWxH kNW0vuR0ryaMmr6VLfwCyq9Vs0MS3KC2+dzjWteyVgMZG1bREhL+kpvU/1lGnq8YpJbBvf buPfV0RWCT7UxGIRXtqdpUYI386w5F/8NkJd+tz2pbpJvoKRW9ZdfOdUF8asIvaxYy62xn nhl/G51zTSxkSBI9q/McX39ak2OkPlQ0Ve83DL+ZPXh6NZZ95HUo/EwaFxBBNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653323758; a=rsa-sha256; cv=none; b=MjPJN7C4+//v5gI9fDw5mH5gB07OuY9NNkJkbJAeVv0n+5OsErVvFp51/Mdtg4w2khN/UQ 6vHk2e91C3lujQbL9oGrhbOuSZZxxQpycrhsflt9z0BBoIoJfMKVcnMlvOuEbLBpNPXmPG WxuUmYynPJKfSDr5+i2ataFMAjS5fiWhJ5EtqpYUtnh71ZXVmNMDIOl2M5z5kk52IYkDqF V+me9r1xkjY/fdPfU/Z+azq2ISZdykeTbxDifHbhVUOYJYBqizPo89Eq9jUjfgofkgEg5I w4RwYDrwDchRNyTX3DOAOUNPuMDcwCeuSrtrHSkykZLqIuqWM4MC8btduuF4mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b25d7f7477316d185277e4d29da220cc742f6802 commit b25d7f7477316d185277e4d29da220cc742f6802 Author: Andrew Turner AuthorDate: 2022-05-23 16:33:53 +0000 Commit: Andrew Turner CommitDate: 2022-05-23 16:33:53 +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 --- 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 8511b2ea5fe2..7c5fd8d787b6 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");