From owner-svn-src-all@FreeBSD.ORG Tue Apr 14 13:18:40 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 6EEF1106564A; Tue, 14 Apr 2009 13:18:40 +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 435D48FC1F; Tue, 14 Apr 2009 13:18:40 +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 n3EDIelm006828; Tue, 14 Apr 2009 13:18:40 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3EDIe1S006827; Tue, 14 Apr 2009 13:18:40 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200904141318.n3EDIe1S006827@svn.freebsd.org> From: Ed Schouten Date: Tue, 14 Apr 2009 13:18:40 +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: r191058 - head/sys/dev/powermac_nvram 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 13:18:40 -0000 Author: ed Date: Tue Apr 14 13:18:39 2009 New Revision: 191058 URL: http://svn.freebsd.org/changeset/base/191058 Log: Use si_drv1 instead of dev2unit() in powermac_nvram. Reviewed by: nwhitehorn Modified: head/sys/dev/powermac_nvram/powermac_nvram.c Modified: head/sys/dev/powermac_nvram/powermac_nvram.c ============================================================================== --- head/sys/dev/powermac_nvram/powermac_nvram.c Tue Apr 14 13:11:34 2009 (r191057) +++ head/sys/dev/powermac_nvram/powermac_nvram.c Tue Apr 14 13:18:39 2009 (r191058) @@ -89,10 +89,6 @@ DRIVER_MODULE(powermac_nvram, nexus, pow * Cdev methods. */ -#define NVRAM_UNIT(dev) dev2unit(dev) -#define NVRAM_SOFTC(unit) ((struct powermac_nvram_softc *) \ - devclass_get_softc(powermac_nvram_devclass, unit)) - static d_open_t powermac_nvram_open; static d_close_t powermac_nvram_close; static d_read_t powermac_nvram_read; @@ -169,6 +165,7 @@ powermac_nvram_attach(device_t dev) sc->sc_cdev = make_dev(&powermac_nvram_cdevsw, 0, 0, 0, 0600, "powermac_nvram"); + sc->sc_cdev->si_drv1 = sc; return 0; } @@ -192,9 +189,8 @@ powermac_nvram_detach(device_t dev) static int powermac_nvram_open(struct cdev *dev, int flags, int fmt, struct thread *td) { - struct powermac_nvram_softc *sc; + struct powermac_nvram_softc *sc = dev->si_drv1; - sc = NVRAM_SOFTC(NVRAM_UNIT(dev)); if (sc->sc_isopen) return EBUSY; sc->sc_isopen = 1; @@ -205,12 +201,10 @@ powermac_nvram_open(struct cdev *dev, in static int powermac_nvram_close(struct cdev *dev, int fflag, int devtype, struct thread *td) { - struct powermac_nvram_softc *sc; + struct powermac_nvram_softc *sc = dev->si_drv1; struct core99_header *header; vm_offset_t bank; - sc = NVRAM_SOFTC(NVRAM_UNIT(dev)); - if (sc->sc_wpos != sizeof(sc->sc_data)) { /* Short write, restore in-memory copy */ bcopy((void *)sc->sc_bank, (void *)sc->sc_data, NVRAM_SIZE); @@ -246,9 +240,7 @@ static int powermac_nvram_read(struct cdev *dev, struct uio *uio, int ioflag) { int rv, amnt, data_available; - struct powermac_nvram_softc *sc; - - sc = NVRAM_SOFTC(NVRAM_UNIT(dev)); + struct powermac_nvram_softc *sc = dev->si_drv1; rv = 0; while (uio->uio_resid > 0) { @@ -271,9 +263,7 @@ static int powermac_nvram_write(struct cdev *dev, struct uio *uio, int ioflag) { int rv, amnt, data_available; - struct powermac_nvram_softc *sc; - - sc = NVRAM_SOFTC(NVRAM_UNIT(dev)); + struct powermac_nvram_softc *sc = dev->si_drv1; if (sc->sc_wpos >= sizeof(sc->sc_data)) return EINVAL;