From owner-cvs-src-old@FreeBSD.ORG Sat Feb 14 21:55:01 2009 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA72D1065676 for ; Sat, 14 Feb 2009 21:55:01 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B7B7E8FC15 for ; Sat, 14 Feb 2009 21:55:01 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1ELt1xL056361 for ; Sat, 14 Feb 2009 21:55:01 GMT (envelope-from mav@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1ELt1I1056360 for cvs-src-old@freebsd.org; Sat, 14 Feb 2009 21:55:01 GMT (envelope-from mav@repoman.freebsd.org) Message-Id: <200902142155.n1ELt1I1056360@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to mav@repoman.freebsd.org using -f From: Alexander Motin Date: Sat, 14 Feb 2009 21:54:44 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/dev/ata ata-cbus.c ata-pci.c ata-usb.c X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Feb 2009 21:55:02 -0000 mav 2009-02-14 21:54:44 UTC FreeBSD src repository Modified files: sys/dev/ata ata-cbus.c ata-pci.c ata-usb.c Log: SVN rev 188615 on 2009-02-14 21:54:44Z by mav DEVICE_PROBE(9) claims that we must not initialize softc on probe stage. Move channel softc initialization from ata_XXX_probe() to ata_XXX_attach(). Instead of calculating ata channel number as position in child device list, pass it's real number directly from controller probe routine using ivars. It is simpler and IMHO more correct. Revision Changes Path 1.27 +27 -18 src/sys/dev/ata/ata-cbus.c 1.132 +15 -20 src/sys/dev/ata/ata-pci.c 1.9 +11 -21 src/sys/dev/ata/ata-usb.c