From nobody Tue Jun 7 14:23:35 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 5C0C77CB2D5; Tue, 7 Jun 2022 14:23:37 +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 4LHXf048wfz3rKp; Tue, 7 Jun 2022 14:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654611816; 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=Mwc2t05BAr/z4N+mE786hxpGzoUFVXVr4ycjkYUloAU=; b=F51L5SrRLHUh+2FFZ3lM6M9NnRby6/sYvJbTh6x5oMknA4vdCiH8lDHUjtnCN+6pJY/Pmn pHlU2zaMFsn5mAqnS4EO5SPEU6hTQSL6Rpt79uKBmLr0gVy3GlWSlGqSDq0I9zHp3c7QCO r9THgEljf4bQoTWRBFRZyWA180IaFrhwpVCibKD68768rTjQoAbXPw+tw2l0FisRYuUqck DozhbDBr9oU3iK4THhnyNma67g5fFyzFHs32rEV2CxSkw2JdBJiu2nl3NQuoxyjzydO/pz lDQvN6LOv2fsXnONFcWYb3hZwYf5IiOuU58g9rS1aKT23bVt/UxgblP8vXGLfw== 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 AFC571CBAF; Tue, 7 Jun 2022 14:23:35 +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 257ENZkm020434; Tue, 7 Jun 2022 14:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 257ENZaP020433; Tue, 7 Jun 2022 14:23:35 GMT (envelope-from git) Date: Tue, 7 Jun 2022 14:23:35 GMT Message-Id: <202206071423.257ENZaP020433@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: f78547c69845 - stable/13 - Error is not a bool in bcm2838_pci, check for != 0 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: f78547c69845a710aef392eed571b8f6aa8e3608 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654611816; 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=Mwc2t05BAr/z4N+mE786hxpGzoUFVXVr4ycjkYUloAU=; b=LKP90z7ru1WWSC/SMG6qDGfRT7S6Ow4T+sQ/vPkAv6WZEEIWUIxAkRPh38pJWGENG+u/sy TBmCI5HWPyERZNqbt72dOMHv2v9clFK67LzgvMqx/hZwnBuG86Y/R8Yl73+KH/1M33ukYJ z/5pADu4A6FWXzuvjqrzkT8ku8wfgePs8jtdRF58FztebDWyI5FVqjhsVaoLND8gBXLqzl 7likewyIsHzTBEaZw9IiDFmSif/cYwRXSDXe3Z6MBxPmaKp4saLVBy698aBQcrZUFOyRy1 /bDFI9nKjEx33R+spYfD2skl3nSKJN/umXke7jhsWFcAHBerswZ/T9a/0UBErQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654611816; a=rsa-sha256; cv=none; b=X8YlKnfcoKECdlrQbZ3mLzd/xhKXAWlMgHXmwGPMsNfD0iyL05bLyV+6PZ/umB/e+qIs0W HkDi0JtKcyCZccofIOTgVv2qdMyJBf4jq0B5GSJKciS+qHAZKM1zPMoOTmXb3/I+wUoefz T3RFXJ6KV74j4Ob89CPc2GKm1jGLM/FQ+JEHLfX5kfv7E8PLs2bRPNjZBEu+EbFZOQIznu bDqePGremFKqr9yRtnO1AD5lq8byWb5KExqYylHpBBiqZX75lGwIuWJ4v5jUm1LUKGZ45/ lVP/zx/sS54oKJ+1inBq8L2vGJ4nDqSmWq4w60oY7TjxfZLEchlk7YI6hb0zKw== 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=f78547c69845a710aef392eed571b8f6aa8e3608 commit f78547c69845a710aef392eed571b8f6aa8e3608 Author: Andrew Turner AuthorDate: 2022-05-23 16:38:18 +0000 Commit: Andrew Turner CommitDate: 2022-06-07 14:20:18 +0000 Error is not a bool in bcm2838_pci, check for != 0 Fix for style an check if error != 0 in the bcm2838 pci driver. Sponsored by: The FreeBSD Foundation (cherry picked from commit c3147104fdddb5cb358726888a0a612439d10f9e) --- sys/arm/broadcom/bcm2835/bcm2838_pci.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c index 377cb83ecbe1..0347a61b3c62 100644 --- a/sys/arm/broadcom/bcm2835/bcm2838_pci.c +++ b/sys/arm/broadcom/bcm2835/bcm2838_pci.c @@ -534,7 +534,7 @@ bcm_pcib_msi_attach(device_t dev) 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) { + if (error != 0) { device_printf(dev, "error: failed to setup MSI handler.\n"); return (ENXIO); } @@ -544,7 +544,7 @@ bcm_pcib_msi_attach(device_t dev) sc->msi_isrcs[i].irq = i; error = intr_isrc_register(&sc->msi_isrcs[i].isrc, dev, 0, "%s,%u", bcm_name, i); - if (error) { + if (error != 0) { device_printf(dev, "error: failed to register interrupt %d.\n", i); return (ENXIO); @@ -556,7 +556,7 @@ bcm_pcib_msi_attach(device_t dev) OF_device_register_xref(xref, dev); error = intr_msi_register(dev, xref); - if (error) + if (error != 0) return (ENXIO); mtx_init(&sc->msi_mtx, "bcm_pcib: msi_mtx", NULL, MTX_DEF); @@ -651,15 +651,15 @@ bcm_pcib_attach(device_t dev) 0, /* flags */ NULL, NULL, /* lockfunc, lockarg */ &sc->dmat); - if (error) + if (error != 0) return (error); error = pci_host_generic_setup_fdt(dev); - if (error) + if (error != 0) return (error); error = bcm_pcib_check_ranges(dev); - if (error) + if (error != 0) return (error); mtx_init(&sc->config_mtx, "bcm_pcib: config_mtx", NULL, MTX_DEF); @@ -743,7 +743,7 @@ bcm_pcib_attach(device_t dev) /* Configure interrupts. */ error = bcm_pcib_msi_attach(dev); - if (error) + if (error != 0) return (error); /* Done. */