From owner-cvs-all@FreeBSD.ORG Thu Jun 17 19:46:13 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 40C2B16A4CE; Thu, 17 Jun 2004 19:46:13 +0000 (GMT) Received: from harmony.village.org (rover.village.org [168.103.84.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id B050143D41; Thu, 17 Jun 2004 19:46:12 +0000 (GMT) (envelope-from imp@bsdimp.com) Received: from localhost (warner@rover2.village.org [10.0.0.1]) by harmony.village.org (8.12.11/8.12.11) with ESMTP id i5HJgvB1040350; Thu, 17 Jun 2004 13:42:57 -0600 (MDT) (envelope-from imp@bsdimp.com) Date: Thu, 17 Jun 2004 13:43:14 -0600 (MDT) Message-Id: <20040617.134314.34763501.imp@bsdimp.com> To: jhb@FreeBSD.org From: "M. Warner Losh" In-Reply-To: <200406171538.08813.jhb@FreeBSD.org> References: <200406171247.04461.jhb@FreeBSD.org> <20040617.132522.102576979.imp@bsdimp.com> <200406171538.08813.jhb@FreeBSD.org> X-Mailer: Mew version 3.3 on Emacs 21.3 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: cvs-src@FreeBSD.org cc: njl@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/i386/i386 bios.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jun 2004 19:46:13 -0000 In message: <200406171538.08813.jhb@FreeBSD.org> John Baldwin writes: : On Thursday 17 June 2004 03:25 pm, M. Warner Losh wrote: : > In message: <200406171247.04461.jhb@FreeBSD.org> : > : > John Baldwin writes: : > : On Tuesday 15 June 2004 11:02 pm, M. Warner Losh wrote: : > : > In message: <200406152008.50656.jhb@FreeBSD.org> : > : > : > : > John Baldwin writes: : > : > : On Monday 14 June 2004 10:12 pm, Nate Lawson wrote: : > : > : > njl 2004-06-15 02:12:12 UTC : > : > : > : > : > : > FreeBSD src repository : > : > : > : > : > : > Modified files: : > : > : > sys/i386/i386 bios.c : > : > : > Log: : > : > : > We only need the devclass_find() result, not the softc. : > : > : : > : > : The devclass still exists if there is no acpi0 device due to 'set : > : > : hint.acpi.0.disabled=1'. Perhaps devclass_get_device() is more : > : > : appropriate than devclass_get_softc() though. : > : > : > : > The hint is insufficient to create the devclass, I believe. It exists : > : > because there's a node in the tree or could be a node in the tree. : > : > devclass_get_device() and checking to see if it is attached might be : > : > even better. : > : : > : The devclass exists even if there is no acpi0 device is my point. If : > : acpi.ko is loaded or compiled into the kernel, then the driver is going : > : to be loaded and the devclass added to the kernel's list. : > : > I think we're saying basically the same thing and arguing over how it : > gets there :-) : > : > Fetching the softc likely isn't the right answer. : > device_is_attached(dev) is likely a better way to go. : : Yes, using that instead of getting the softc would be fine. However, it would : need to check that the passed in dev is NULL in that case. You would need to : do: : : device_t acpidev; : : acpidev = devclass_get_device(devclass_find("acpi"), 0); : if (acpidev != NULL && device_is_attached(acpidev)) : return; : : rather than: : : if (devclass_get_softc(devclass_find("acpi"), 0) != NULL) : return; True. : Which requires an extra variable, etc. If device_is_attached() checked for : NULL argument you could do: : : if (device_is_attached(devclass_get_device(devclass_find("acpi"), 0))) : return; Easy enough to arrange... Warner