d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneeded device index from unit number.

Browse Source 
We only use the unit number to determine whether we should rewind the
device upon closure.
This commit is contained in:
ed 2009-04-26 09:21:37 +00:00
parent fbc761189e
commit 834cd6cbf8
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/dev/ata/atapi-tape.c
View File

@ -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, int fmt, struct thread *td)
(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)