From owner-svn-src-all@FreeBSD.ORG Tue Apr 14 14:02:44 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BCB0106567C; Tue, 14 Apr 2009 14:02:44 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E46758FC19; Tue, 14 Apr 2009 14:02:43 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3EE2haI007750; Tue, 14 Apr 2009 14:02:43 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3EE2hwB007748; Tue, 14 Apr 2009 14:02:43 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200904141402.n3EE2hwB007748@svn.freebsd.org> From: Ed Schouten Date: Tue, 14 Apr 2009 14:02:43 +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: r191060 - in head/sys/dev: twa twe X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2009 14:02:45 -0000 Author: ed Date: Tue Apr 14 14:02:43 2009 New Revision: 191060 URL: http://svn.freebsd.org/changeset/base/191060 Log: Use si_drv1 instead of dev2unit() in twe(4) and twa(4) Reviewed by: scottl Modified: head/sys/dev/twa/tw_osl_freebsd.c head/sys/dev/twe/twe_freebsd.c Modified: head/sys/dev/twa/tw_osl_freebsd.c ============================================================================== --- head/sys/dev/twa/tw_osl_freebsd.c Tue Apr 14 13:43:09 2009 (r191059) +++ head/sys/dev/twa/tw_osl_freebsd.c Tue Apr 14 14:02:43 2009 (r191060) @@ -88,8 +88,7 @@ static devclass_t twa_devclass; static TW_INT32 twa_open(struct cdev *dev, TW_INT32 flags, TW_INT32 fmt, d_thread_t *proc) { - TW_INT32 unit = dev2unit(dev); - struct twa_softc *sc = devclass_get_softc(twa_devclass, unit); + struct twa_softc *sc = (struct twa_softc *)(dev->si_drv1); tw_osli_dbg_dprintf(5, sc, "entered"); sc->state |= TW_OSLI_CTLR_STATE_OPEN; @@ -114,8 +113,7 @@ twa_open(struct cdev *dev, TW_INT32 flag static TW_INT32 twa_close(struct cdev *dev, TW_INT32 flags, TW_INT32 fmt, d_thread_t *proc) { - TW_INT32 unit = dev2unit(dev); - struct twa_softc *sc = devclass_get_softc(twa_devclass, unit); + struct twa_softc *sc = (struct twa_softc *)(dev->si_drv1); tw_osli_dbg_dprintf(5, sc, "entered"); sc->state &= ~TW_OSLI_CTLR_STATE_OPEN; Modified: head/sys/dev/twe/twe_freebsd.c ============================================================================== --- head/sys/dev/twe/twe_freebsd.c Tue Apr 14 13:43:09 2009 (r191059) +++ head/sys/dev/twe/twe_freebsd.c Tue Apr 14 14:02:43 2009 (r191060) @@ -81,8 +81,7 @@ static struct cdevsw twe_cdevsw = { static int twe_open(struct cdev *dev, int flags, int fmt, d_thread_t *td) { - int unit = dev2unit(dev); - struct twe_softc *sc = devclass_get_softc(twe_devclass, unit); + struct twe_softc *sc = (struct twe_softc *)dev->si_drv1; sc->twe_state |= TWE_STATE_OPEN; return(0); @@ -94,8 +93,7 @@ twe_open(struct cdev *dev, int flags, in static int twe_close(struct cdev *dev, int flags, int fmt, d_thread_t *td) { - int unit = dev2unit(dev); - struct twe_softc *sc = devclass_get_softc(twe_devclass, unit); + struct twe_softc *sc = (struct twe_softc *)dev->si_drv1; sc->twe_state &= ~TWE_STATE_OPEN; return (0);