From owner-p4-projects  Sun Dec 22 12:51:50 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 62A5B37B405; Sun, 22 Dec 2002 12:51:48 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EA11C37B401
	for <perforce@freebsd.org>; Sun, 22 Dec 2002 12:51:47 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7B04D43EEA
	for <perforce@freebsd.org>; Sun, 22 Dec 2002 12:51:47 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gBMKplfh045068
	for <perforce@freebsd.org>; Sun, 22 Dec 2002 12:51:47 -0800 (PST)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gBMKpkKo045065
	for perforce@freebsd.org; Sun, 22 Dec 2002 12:51:46 -0800 (PST)
Date: Sun, 22 Dec 2002 12:51:46 -0800 (PST)
Message-Id: <200212222051.gBMKpkKo045065@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Subject: PERFORCE change 22630 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=22630

Change 22630 by marcel@marcel_nfs on 2002/12/22 12:50:49

	Let's not redefine bst and bsh in the attach method. We define
	them in the probe method and since sioprobe can swap the softc,
	it seems better to just leave them alone. This assumes that
	attach does not get different resources than probe...

Affected files ...

.. //depot/projects/ia64/sys/dev/sio/sio_pci.c#11 edit

Differences ...

==== //depot/projects/ia64/sys/dev/sio/sio_pci.c#11 (text+ko) ====

@@ -109,8 +109,6 @@
 	rid = (id->rid >= 0) ? id->rid : -id->rid;
 	space = (id->rid >= 0) ? SYS_RES_IOPORT : SYS_RES_MEMORY;
 	res = bus_alloc_resource(dev, space, &rid, 0, ~0, 8, RF_ACTIVE);
-	com->bsh = rman_get_bushandle(res);
-	com->bst = rman_get_bustag(res);
 	error = sioattach(dev);
 	if (error)
 		bus_release_resource(dev, space, rid, res);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message