[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <2559266325cef800503beb097b24bb0cbe3ef215.1259733457.git.joe@perches.com>
Date: Tue, 1 Dec 2009 22:07:52 -0800
From: Joe Perches <joe@...ches.com>
To: Stephen Hemminger <shemminger@...tta.com>
Cc: LKML <linux-kernel@...r.kernel.org>,
Marcin Slusarz <marcin.slusarz@...il.com>
Subject: [PATCH 12/13] drivers/block/floppy.c: Readd SunOS eject cmd comment
And a little comment neatening
Signed-off-by: Joe Perches <joe@...ches.com>
---
drivers/block/floppy.c | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index e054fae..7c33f61 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -1814,8 +1814,7 @@ static int fdc_configure(void)
return 0;
output_byte(0);
output_byte(0x10 | (no_fifo & 0x20) | (fifo_depth & 0xf));
- output_byte(0); /* pre-compensation from track
- 0 upwards */
+ output_byte(0); /* pre-compensation from track 0 upwards */
return 1;
}
@@ -3991,9 +3990,12 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
} inparam; /* parameters coming from user space */
const char *outparam; /* parameters passed back to user space */
- /* convert compatibility eject ioctls into floppy eject ioctl.
+ /*
+ * convert compatibility eject ioctls into floppy eject ioctl.
* We do this in order to provide a means to eject floppy disks before
- * installing the new fdutils package */
+ * installing the new fdutils package,
+ * 0x6470 is SunOS floppy eject
+ */
if (cmd == CDROMEJECT || cmd == 0x6470) {
DPRINT("obsolete eject ioctl\n");
DPRINT("please use floppycontrol --eject\n");
@@ -4029,8 +4031,8 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
if (lock_fdc(drive, true))
return -EINTR;
- /* do the actual eject. Fails on
- * non-Sparc architectures */
+ /* Do the actual eject.
+ * Fails on non-Sparc architectures */
ret = fd_eject(UNIT(drive));
set_bit(FD_DISK_CHANGED_BIT, &UDRS->flags);
--
1.6.6.rc0.57.gad7a
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists