From nobody Mon May 23 17:24:42 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 EFE061B41FF8; Mon, 23 May 2022 17:24:42 +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 4L6PMt5s2Dz3LYY; Mon, 23 May 2022 17:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653326682; 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=WFjYy5RI7hi5C6Ra4hotbGuYDBJ7VfkVgf5raSoshb4=; b=gGF3b0KWhufXF972YExt3o+sadrqQB+oYA8gA29hMqqIrqoX3/UnC9XaAFJUM6w3Qrplxx 24+DbAoEw568JFA0xI8qRsfF+3adFD5xH3d+XD7VHisrZZQWfUfDsFsyDSbAl34rUbM0KC hHWgROBv+TBSVzfE97ZQpfhGZL0c06DNDTdf23AmfiarGXBQL/zKBQZvHX1Q+TYmPYGsHf puGqTRFe+zhgDErHvTYWUETZMAMsKxMSKv5dhVI5c4fCIYJdW3b5LCYlegwVtkGhH9tJXq mLPDiMl4NR2VLUxtPGDPnZF6PTRwhnv05KWJWXJxMHnfSczkaKhq17ID6qh/rg== 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 A432D14379; Mon, 23 May 2022 17:24:42 +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 24NHOgUc006425; Mon, 23 May 2022 17:24:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NHOgwQ006424; Mon, 23 May 2022 17:24:42 GMT (envelope-from git) Date: Mon, 23 May 2022 17:24:42 GMT Message-Id: <202205231724.24NHOgwQ006424@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: 5749fdc53517 - main - Use the error given in the bcm PCI driver 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: 5749fdc53517179d9922235c9a1b5e99c6ac3abc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653326682; 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=WFjYy5RI7hi5C6Ra4hotbGuYDBJ7VfkVgf5raSoshb4=; b=bcRIun2x0D5XLYbLk9h3FhYQqqTpEDG9AqrwPQRq7mC2S9iO1VMGRfzEfe7+TaJmUvJF4u bfusNoP9hQSLneRl1/IZ7/lxwrpaB7Wqm/YZRf6c4Wh6OquBeIAKPu/hHHtFUnivcTSV56 e5q7MHmfQ2dBJ1jFADvenIPOSFcA7HzNVcHCcszljZbvoQislI3UuXJjPaGj17isDjv6Of gB0cjZEKb1Dt2cGz6RbMP7t/cmZqhi5LcO1yyQsZrYyrNdUmzScoQVImGiQ3hyOoM0yCya 1zjc08fMVkGAWqXo/WplPD36K1Q296NszguXEqt0vBird9464VeCOXlGXHibrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653326682; a=rsa-sha256; cv=none; b=DQhFQaKPnTeqvUJowPXFSszwS7Px1nUIaDol3sz45vsW5kuG4D06ZJ5u6SJkBW6puSQ+qw Qy2aDxFYEhI/vghmpUXobs7a59/uArCKdj9zMIhuARXa6AqULfzJ33kj22a+vkkkyBoZzA /iGzLMPV5sBHKWS4XmdSy5p39clfUAz9ArD7aX3jOZ1Kt9tjTV2XbBX7pO35IGDl6lh/I4 6uMc4p0MDK4TZCI3O9lEzygQ2l33hwbjXW/V8m/SNkJ2mq9+IUveYfJXJIQ2tyompdKX6d SAyIj484sN8E1INsvKozY/j9dx89QXsGYXer0u18Hi7LnRtoqoA2p5f2Fatc6Q== 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=5749fdc53517179d9922235c9a1b5e99c6ac3abc commit 5749fdc53517179d9922235c9a1b5e99c6ac3abc Author: Andrew Turner AuthorDate: 2022-05-23 17:21:40 +0000 Commit: Andrew Turner CommitDate: 2022-05-23 17:21:40 +0000 Use the error given in the bcm PCI driver When given an error return it and not just ENXIO as it may contain information usefule to debug an error. Sponsored by: The FreeBSD Foundation --- sys/arm/broadcom/bcm2835/bcm2838_pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2838_pci.c b/sys/arm/broadcom/bcm2835/bcm2838_pci.c index dee90a4532bc..534ff790245e 100644 --- a/sys/arm/broadcom/bcm2835/bcm2838_pci.c +++ b/sys/arm/broadcom/bcm2835/bcm2838_pci.c @@ -536,7 +536,7 @@ bcm_pcib_msi_attach(device_t dev) INTR_MPSAFE, bcm_pcib_msi_intr, NULL, sc, &sc->msi_intr_cookie); if (error != 0) { device_printf(dev, "error: failed to setup MSI handler.\n"); - return (ENXIO); + return (error); } bcm_name = device_get_nameunit(dev); @@ -547,7 +547,7 @@ bcm_pcib_msi_attach(device_t dev) if (error != 0) { device_printf(dev, "error: failed to register interrupt %d.\n", i); - return (ENXIO); + return (error); } } @@ -557,7 +557,7 @@ bcm_pcib_msi_attach(device_t dev) error = intr_msi_register(dev, xref); if (error != 0) - return (ENXIO); + return (error); mtx_init(&sc->msi_mtx, "bcm_pcib: msi_mtx", NULL, MTX_DEF);