From owner-svn-src-all@freebsd.org  Thu Oct 17 19:53:56 2019
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-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 7FEAD15C588;
 Thu, 17 Oct 2019 19:53:56 +0000 (UTC) (envelope-from cem@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)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46vKc42gW6z4dgN;
 Thu, 17 Oct 2019 19:53:56 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3F73D25973;
 Thu, 17 Oct 2019 19:53:56 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x9HJruM1011477;
 Thu, 17 Oct 2019 19:53:56 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9HJruHx011476;
 Thu, 17 Oct 2019 19:53:56 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201910171953.x9HJruHx011476@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: Conrad Meyer <cem@FreeBSD.org>
Date: Thu, 17 Oct 2019 19:53:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r353693 - head/sys/dev/acpica
X-SVN-Group: head
X-SVN-Commit-Author: cem
X-SVN-Commit-Paths: head/sys/dev/acpica
X-SVN-Commit-Revision: 353693
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 Oct 2019 19:53:56 -0000

Author: cem
Date: Thu Oct 17 19:53:55 2019
New Revision: 353693
URL: https://svnweb.freebsd.org/changeset/base/353693

Log:
  acpica: Fix for the fix, unfortunately
  
  Follow-up to incomplete pedantic change in r353691 by actually fixing the
  default implementation to match the interface type.  Mea culpa.
  
  X-MFC-With:	r353691, r339754

Modified:
  head/sys/dev/acpica/acpi_if.m

Modified: head/sys/dev/acpica/acpi_if.m
==============================================================================
--- head/sys/dev/acpica/acpi_if.m	Thu Oct 17 19:49:20 2019	(r353692)
+++ head/sys/dev/acpica/acpi_if.m	Thu Oct 17 19:53:55 2019	(r353693)
@@ -61,11 +61,11 @@ HEADER {
 # Default implementation for acpi_id_probe().
 #
 CODE {
-	static char *
+	static int
 	acpi_generic_id_probe(device_t bus, device_t dev, char **ids,
 	    char **match)
 	{
-		return (NULL);
+		return (ENXIO);
 	}
 };