From owner-svn-src-head@FreeBSD.ORG Tue Jan 18 14:58:44 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA829106564A; Tue, 18 Jan 2011 14:58:44 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA04B8FC0C; Tue, 18 Jan 2011 14:58:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0IEwifK041500; Tue, 18 Jan 2011 14:58:44 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0IEwiXq041498; Tue, 18 Jan 2011 14:58:44 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201101181458.p0IEwiXq041498@svn.freebsd.org> From: John Baldwin Date: Tue, 18 Jan 2011 14:58:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217537 - head/sys/dev/acpica X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jan 2011 14:58:45 -0000 Author: jhb Date: Tue Jan 18 14:58:44 2011 New Revision: 217537 URL: http://svn.freebsd.org/changeset/base/217537 Log: Remove bogus check. pcib_get_bus() (like other BUS_ACCESSOR() methods) doesn't "fail", it may merely return garbage if it is not a valid ivar for a given device. Our parent device must be a 'pcib' device, so we can just assume it implements pcib IVARs, and all pcib devices have a bus number. Submitted by: clang via rdivacky Modified: head/sys/dev/acpica/acpi_pci.c Modified: head/sys/dev/acpica/acpi_pci.c ============================================================================== --- head/sys/dev/acpica/acpi_pci.c Tue Jan 18 14:58:12 2011 (r217536) +++ head/sys/dev/acpica/acpi_pci.c Tue Jan 18 14:58:44 2011 (r217537) @@ -281,8 +281,6 @@ static int acpi_pci_probe(device_t dev) { - if (pcib_get_bus(dev) < 0) - return (ENXIO); if (acpi_get_handle(dev) == NULL) return (ENXIO); device_set_desc(dev, "ACPI PCI bus");