From owner-svn-src-all@FreeBSD.ORG Sun Apr 26 09:21:38 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 5394F106566C; Sun, 26 Apr 2009 09:21:38 +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 4201E8FC13; Sun, 26 Apr 2009 09:21:38 +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 n3Q9LctY078280; Sun, 26 Apr 2009 09:21:38 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3Q9LcUO078279; Sun, 26 Apr 2009 09:21:38 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <200904260921.n3Q9LcUO078279@svn.freebsd.org> From: Ed Schouten Date: Sun, 26 Apr 2009 09:21:38 +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: r191516 - head/sys/dev/ata 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: Sun, 26 Apr 2009 09:21:38 -0000 Author: ed Date: Sun Apr 26 09:21:37 2009 New Revision: 191516 URL: http://svn.freebsd.org/changeset/base/191516 Log: Remove unneeded device index from unit number. We only use the unit number to determine whether we should rewind the device upon closure. Modified: head/sys/dev/ata/atapi-tape.c Modified: head/sys/dev/ata/atapi-tape.c ============================================================================== --- head/sys/dev/ata/atapi-tape.c Sun Apr 26 08:29:35 2009 (r191515) +++ head/sys/dev/ata/atapi-tape.c Sun Apr 26 09:21:37 2009 (r191516) @@ -138,15 +138,13 @@ ast_attach(device_t dev) DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_SEQUENTIAL | DEVSTAT_TYPE_IF_IDE, DEVSTAT_PRIORITY_TAPE); - device = make_dev(&ast_cdevsw, 2 * device_get_unit(dev), - UID_ROOT, GID_OPERATOR, 0640, "ast%d", - device_get_unit(dev)); + device = make_dev(&ast_cdevsw, 0, UID_ROOT, GID_OPERATOR, 0640, + "ast%d", device_get_unit(dev)); device->si_drv1 = dev; device->si_iosize_max = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS; stp->dev1 = device; - device = make_dev(&ast_cdevsw, 2 * device_get_unit(dev) + 1, - UID_ROOT, GID_OPERATOR, 0640, "nast%d", - device_get_unit(dev)); + device = make_dev(&ast_cdevsw, 1, UID_ROOT, GID_OPERATOR, 0640, + "nast%d", device_get_unit(dev)); device->si_drv1 = dev; device->si_iosize_max = ch->dma.max_iosize; stp->dev2 = device; @@ -238,8 +236,8 @@ ast_close(struct cdev *cdev, int flags, (stp->flags & (F_DATA_WRITTEN | F_FM_WRITTEN)) == F_DATA_WRITTEN) ast_write_filemark(dev, ATAPI_WF_WRITE); - /* if minor is even rewind on close */ - if (!(dev2unit(cdev) & 0x01)) + /* if unit is zero rewind on close */ + if (dev2unit(cdev) == 0) ast_rewind(dev); if (stp->cap.lock && count_dev(cdev) == 1)