]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/ide/ide-floppy.c
ide: add ide_init_pc() helper
[linux-2.6-omap-h63xx.git] / drivers / ide / ide-floppy.c
index 673644fdb6f2f8be6cd5a5c21d36ff4112bd4434..e04eaa49a8bf1508f461d4578770dbdac11eb6ee 100644 (file)
@@ -15,6 +15,8 @@
  * Documentation/ide/ChangeLog.ide-floppy.1996-2002
  */
 
+#define DRV_NAME "ide-floppy"
+
 #define IDEFLOPPY_VERSION "1.00"
 
 #include <linux/module.h>
@@ -34,6 +36,7 @@
 #include <linux/hdreg.h>
 #include <linux/bitops.h>
 #include <linux/mutex.h>
+#include <linux/scatterlist.h>
 
 #include <scsi/scsi_ioctl.h>
 
  */
 #define IDEFLOPPY_MAX_PC_RETRIES       3
 
-/*
- * With each packet command, we allocate a buffer of IDEFLOPPY_PC_BUFFER_SIZE
- * bytes.
- */
-#define IDEFLOPPY_PC_BUFFER_SIZE       256
-
-/*
- * In various places in the driver, we need to allocate storage for packet
- * commands and requests, which will remain valid while        we leave the driver to
- * wait for an interrupt or a timeout event.
- */
-#define IDEFLOPPY_PC_STACK             (10 + IDEFLOPPY_MAX_PC_RETRIES)
-
 /* format capacities descriptor codes */
 #define CAPACITY_INVALID       0x00
 #define CAPACITY_UNFORMATTED   0x01
@@ -101,13 +91,11 @@ typedef struct ide_floppy_obj {
        struct ide_atapi_pc *pc;
        /* Last failed packet command */
        struct ide_atapi_pc *failed_pc;
-       /* Packet command stack */
-       struct ide_atapi_pc pc_stack[IDEFLOPPY_PC_STACK];
-       /* Next free packet command storage space */
-       int pc_stack_index;
-       struct request rq_stack[IDEFLOPPY_PC_STACK];
-       /* We implement a circular array */
-       int rq_stack_index;
+       /* used for blk_{fs,pc}_request() requests */
+       struct ide_atapi_pc queued_pc;
+
+       struct ide_atapi_pc request_sense_pc;
+       struct request request_sense_rq;
 
        /* Last error information */
        u8 sense_key, asc, ascq;
@@ -130,12 +118,6 @@ typedef struct ide_floppy_obj {
 
 #define IDEFLOPPY_TICKS_DELAY  HZ/20   /* default delay for ZIP 100 (50ms) */
 
-/* Defines for the MODE SENSE command */
-#define MODE_SENSE_CURRENT             0x00
-#define MODE_SENSE_CHANGEABLE          0x01
-#define MODE_SENSE_DEFAULT             0x02
-#define MODE_SENSE_SAVED               0x03
-
 /* IOCTLs used in low-level formatting. */
 #define        IDEFLOPPY_IOCTL_FORMAT_SUPPORTED        0x4600
 #define        IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY     0x4601
@@ -220,44 +202,6 @@ static int idefloppy_end_request(ide_drive_t *drive, int uptodate, int nsecs)
        return 0;
 }
 
-static void ide_floppy_io_buffers(ide_drive_t *drive, struct ide_atapi_pc *pc,
-                                 unsigned int bcount, int direction)
-{
-       ide_hwif_t *hwif = drive->hwif;
-       struct request *rq = pc->rq;
-       struct req_iterator iter;
-       struct bio_vec *bvec;
-       unsigned long flags;
-       int count, done = 0;
-       char *data;
-
-       rq_for_each_segment(bvec, rq, iter) {
-               if (!bcount)
-                       break;
-
-               count = min(bvec->bv_len, bcount);
-
-               data = bvec_kmap_irq(bvec, &flags);
-               if (direction)
-                       hwif->tp_ops->output_data(drive, NULL, data, count);
-               else
-                       hwif->tp_ops->input_data(drive, NULL, data, count);
-               bvec_kunmap_irq(data, &flags);
-
-               bcount -= count;
-               pc->b_count += count;
-               done += count;
-       }
-
-       idefloppy_end_request(drive, 1, done >> 9);
-
-       if (bcount) {
-               printk(KERN_ERR "%s: leftover data in %s, bcount == %d\n",
-                               drive->name, __func__, bcount);
-               ide_pad_transfer(drive, direction, bcount);
-       }
-}
-
 static void idefloppy_update_buffers(ide_drive_t *drive,
                                struct ide_atapi_pc *pc)
 {
@@ -287,24 +231,6 @@ static void idefloppy_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc,
        ide_do_drive_cmd(drive, rq);
 }
 
-static struct ide_atapi_pc *idefloppy_next_pc_storage(ide_drive_t *drive)
-{
-       idefloppy_floppy_t *floppy = drive->driver_data;
-
-       if (floppy->pc_stack_index == IDEFLOPPY_PC_STACK)
-               floppy->pc_stack_index = 0;
-       return (&floppy->pc_stack[floppy->pc_stack_index++]);
-}
-
-static struct request *idefloppy_next_rq_storage(ide_drive_t *drive)
-{
-       idefloppy_floppy_t *floppy = drive->driver_data;
-
-       if (floppy->rq_stack_index == IDEFLOPPY_PC_STACK)
-               floppy->rq_stack_index = 0;
-       return (&floppy->rq_stack[floppy->rq_stack_index++]);
-}
-
 static void ide_floppy_callback(ide_drive_t *drive)
 {
        idefloppy_floppy_t *floppy = drive->driver_data;
@@ -342,16 +268,9 @@ static void ide_floppy_callback(ide_drive_t *drive)
        idefloppy_end_request(drive, uptodate, 0);
 }
 
-static void idefloppy_init_pc(struct ide_atapi_pc *pc)
-{
-       memset(pc, 0, sizeof(*pc));
-       pc->buf = pc->pc_buf;
-       pc->buf_size = IDEFLOPPY_PC_BUFFER_SIZE;
-}
-
 static void idefloppy_create_request_sense_cmd(struct ide_atapi_pc *pc)
 {
-       idefloppy_init_pc(pc);
+       ide_init_pc(pc);
        pc->c[0] = GPCMD_REQUEST_SENSE;
        pc->c[4] = 255;
        pc->req_xfer = 18;
@@ -363,12 +282,11 @@ static void idefloppy_create_request_sense_cmd(struct ide_atapi_pc *pc)
  */
 static void idefloppy_retry_pc(ide_drive_t *drive)
 {
-       struct ide_atapi_pc *pc;
-       struct request *rq;
+       struct ide_floppy_obj *floppy = drive->driver_data;
+       struct request *rq = &floppy->request_sense_rq;
+       struct ide_atapi_pc *pc = &floppy->request_sense_pc;
 
        (void)ide_read_error(drive);
-       pc = idefloppy_next_pc_storage(drive);
-       rq = idefloppy_next_rq_storage(drive);
        idefloppy_create_request_sense_cmd(pc);
        idefloppy_queue_pc_head(drive, pc, rq);
 }
@@ -380,7 +298,7 @@ static ide_startstop_t idefloppy_pc_intr(ide_drive_t *drive)
 
        return ide_pc_intr(drive, floppy->pc, idefloppy_pc_intr,
                           IDEFLOPPY_WAIT_CMD, NULL, idefloppy_update_buffers,
-                          idefloppy_retry_pc, NULL, ide_floppy_io_buffers);
+                          idefloppy_retry_pc, NULL, ide_io_buffers);
 }
 
 /*
@@ -482,14 +400,14 @@ static void idefloppy_create_prevent_cmd(struct ide_atapi_pc *pc, int prevent)
 {
        debug_log("creating prevent removal command, prevent = %d\n", prevent);
 
-       idefloppy_init_pc(pc);
+       ide_init_pc(pc);
        pc->c[0] = GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL;
        pc->c[4] = prevent;
 }
 
 static void idefloppy_create_read_capacity_cmd(struct ide_atapi_pc *pc)
 {
-       idefloppy_init_pc(pc);
+       ide_init_pc(pc);
        pc->c[0] = GPCMD_READ_FORMAT_CAPACITIES;
        pc->c[7] = 255;
        pc->c[8] = 255;
@@ -499,7 +417,7 @@ static void idefloppy_create_read_capacity_cmd(struct ide_atapi_pc *pc)
 static void idefloppy_create_format_unit_cmd(struct ide_atapi_pc *pc, int b,
                int l, int flags)
 {
-       idefloppy_init_pc(pc);
+       ide_init_pc(pc);
        pc->c[0] = GPCMD_FORMAT_UNIT;
        pc->c[1] = 0x17;
 
@@ -519,14 +437,14 @@ static void idefloppy_create_format_unit_cmd(struct ide_atapi_pc *pc, int b,
 
 /* A mode sense command is used to "sense" floppy parameters. */
 static void idefloppy_create_mode_sense_cmd(struct ide_atapi_pc *pc,
-               u8 page_code, u8 type)
+                                           u8 page_code)
 {
        u16 length = 8; /* sizeof(Mode Parameter Header) = 8 Bytes */
 
-       idefloppy_init_pc(pc);
+       ide_init_pc(pc);
        pc->c[0] = GPCMD_MODE_SENSE_10;
        pc->c[1] = 0;
-       pc->c[2] = page_code + (type << 6);
+       pc->c[2] = page_code;
 
        switch (page_code) {
        case IDEFLOPPY_CAPABILITIES_PAGE:
@@ -545,7 +463,7 @@ static void idefloppy_create_mode_sense_cmd(struct ide_atapi_pc *pc,
 
 static void idefloppy_create_start_stop_cmd(struct ide_atapi_pc *pc, int start)
 {
-       idefloppy_init_pc(pc);
+       ide_init_pc(pc);
        pc->c[0] = GPCMD_START_STOP_UNIT;
        pc->c[4] = start;
 }
@@ -561,7 +479,7 @@ static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
        debug_log("create_rw10_cmd: block == %d, blocks == %d\n",
                block, blocks);
 
-       idefloppy_init_pc(pc);
+       ide_init_pc(pc);
        pc->c[0] = cmd == READ ? GPCMD_READ_10 : GPCMD_WRITE_10;
        put_unaligned(cpu_to_be16(blocks), (unsigned short *)&pc->c[7]);
        put_unaligned(cpu_to_be32(block), (unsigned int *) &pc->c[2]);
@@ -569,7 +487,7 @@ static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
        memcpy(rq->cmd, pc->c, 12);
 
        pc->rq = rq;
-       pc->b_count = cmd == READ ? 0 : rq->bio->bi_size;
+       pc->b_count = 0;
        if (rq->cmd_flags & REQ_RW)
                pc->flags |= PC_FLAG_WRITING;
        pc->buf = NULL;
@@ -580,10 +498,10 @@ static void idefloppy_create_rw_cmd(idefloppy_floppy_t *floppy,
 static void idefloppy_blockpc_cmd(idefloppy_floppy_t *floppy,
                struct ide_atapi_pc *pc, struct request *rq)
 {
-       idefloppy_init_pc(pc);
+       ide_init_pc(pc);
        memcpy(pc->c, rq->cmd, sizeof(pc->c));
        pc->rq = rq;
-       pc->b_count = rq->data_len;
+       pc->b_count = 0;
        if (rq->data_len && rq_data_dir(rq) == WRITE)
                pc->flags |= PC_FLAG_WRITING;
        pc->buf = rq->data;
@@ -600,15 +518,17 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive,
                struct request *rq, sector_t block_s)
 {
        idefloppy_floppy_t *floppy = drive->driver_data;
+       ide_hwif_t *hwif = drive->hwif;
        struct ide_atapi_pc *pc;
        unsigned long block = (unsigned long)block_s;
 
-       debug_log("dev: %s, cmd_type: %x, errors: %d\n",
-                       rq->rq_disk ? rq->rq_disk->disk_name : "?",
-                       rq->cmd_type, rq->errors);
-       debug_log("sector: %ld, nr_sectors: %ld, "
-                       "current_nr_sectors: %d\n", (long)rq->sector,
-                       rq->nr_sectors, rq->current_nr_sectors);
+       debug_log("%s: dev: %s, cmd: 0x%x, cmd_type: %x, errors: %d\n",
+                 __func__, rq->rq_disk ? rq->rq_disk->disk_name : "?",
+                 rq->cmd[0], rq->cmd_type, rq->errors);
+
+       debug_log("%s: sector: %ld, nr_sectors: %ld, current_nr_sectors: %d\n",
+                 __func__, (long)rq->sector, rq->nr_sectors,
+                 rq->current_nr_sectors);
 
        if (rq->errors >= ERROR_MAX) {
                if (floppy->failed_pc)
@@ -627,12 +547,12 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive,
                        idefloppy_end_request(drive, 0, 0);
                        return ide_stopped;
                }
-               pc = idefloppy_next_pc_storage(drive);
+               pc = &floppy->queued_pc;
                idefloppy_create_rw_cmd(floppy, pc, rq, block);
        } else if (blk_special_request(rq)) {
                pc = (struct ide_atapi_pc *) rq->buffer;
        } else if (blk_pc_request(rq)) {
-               pc = idefloppy_next_pc_storage(drive);
+               pc = &floppy->queued_pc;
                idefloppy_blockpc_cmd(floppy, pc, rq);
        } else {
                blk_dump_rq_flags(rq,
@@ -641,6 +561,12 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive,
                return ide_stopped;
        }
 
+       ide_init_sg_cmd(drive, rq);
+       ide_map_sg(drive, rq);
+
+       pc->sg = hwif->sg_table;
+       pc->sg_cnt = hwif->sg_nents;
+
        pc->rq = rq;
 
        return idefloppy_issue_pc(drive, pc);
@@ -679,8 +605,7 @@ static int ide_floppy_get_flexible_disk_page(ide_drive_t *drive)
        u16 transfer_rate, sector_size, cyls, rpm;
        u8 heads, sectors;
 
-       idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE,
-                                       MODE_SENSE_CURRENT);
+       idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_FLEXIBLE_DISK_PAGE);
 
        if (idefloppy_queue_pc_tail(drive, &pc)) {
                printk(KERN_ERR "ide-floppy: Can't get flexible disk page"
@@ -728,15 +653,15 @@ static int idefloppy_get_sfrp_bit(ide_drive_t *drive)
        struct ide_atapi_pc pc;
 
        floppy->srfp = 0;
-       idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_CAPABILITIES_PAGE,
-                                                MODE_SENSE_CURRENT);
 
+       idefloppy_create_mode_sense_cmd(&pc, IDEFLOPPY_CAPABILITIES_PAGE);
        pc.flags |= PC_FLAG_SUPPRESS_ERROR;
+
        if (idefloppy_queue_pc_tail(drive, &pc))
                return 1;
 
        floppy->srfp = pc.buf[8 + 2] & 0x40;
-       return (0);
+       return 0;
 }
 
 /*
@@ -864,16 +789,17 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)
        int __user *argp;
 
        if (get_user(u_array_size, arg))
-               return (-EFAULT);
+               return -EFAULT;
 
        if (u_array_size <= 0)
-               return (-EINVAL);
+               return -EINVAL;
 
        idefloppy_create_read_capacity_cmd(&pc);
        if (idefloppy_queue_pc_tail(drive, &pc)) {
                printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");
-               return (-EIO);
+               return -EIO;
        }
+
        header_len = pc.buf[3];
        desc_cnt = header_len / 8; /* capacity descriptor of 8 bytes */
 
@@ -895,19 +821,22 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)
                length = be16_to_cpup((__be16 *)&pc.buf[desc_start + 6]);
 
                if (put_user(blocks, argp))
-                       return(-EFAULT);
+                       return -EFAULT;
+
                ++argp;
 
                if (put_user(length, argp))
-                       return (-EFAULT);
+                       return -EFAULT;
+
                ++argp;
 
                ++u_index;
        }
 
        if (put_user(u_index, arg))
-               return (-EFAULT);
-       return (0);
+               return -EFAULT;
+
+       return 0;
 }
 
 /*
@@ -920,7 +849,7 @@ static int ide_floppy_get_format_capacities(ide_drive_t *drive, int __user *arg)
  * the dsc bit, and return either 0 or 65536.
  */
 
-static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg)
+static int ide_floppy_get_format_progress(ide_drive_t *drive, int __user *arg)
 {
        idefloppy_floppy_t *floppy = drive->driver_data;
        struct ide_atapi_pc pc;
@@ -929,7 +858,7 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg)
        if (floppy->srfp) {
                idefloppy_create_request_sense_cmd(&pc);
                if (idefloppy_queue_pc_tail(drive, &pc))
-                       return (-EIO);
+                       return -EIO;
 
                if (floppy->sense_key == 2 &&
                    floppy->asc == 4 &&
@@ -948,10 +877,11 @@ static int idefloppy_get_format_progress(ide_drive_t *drive, int __user *arg)
 
                progress_indication = ((stat & ATA_DSC) == 0) ? 0 : 0x10000;
        }
+
        if (put_user(progress_indication, arg))
-               return (-EFAULT);
+               return -EFAULT;
 
-       return (0);
+       return 0;
 }
 
 static sector_t idefloppy_capacity(ide_drive_t *drive)
@@ -962,50 +892,6 @@ static sector_t idefloppy_capacity(ide_drive_t *drive)
        return capacity;
 }
 
-/*
- * Check whether we can support a drive, based on the ATAPI IDENTIFY command
- * results.
- */
-static int idefloppy_identify_device(ide_drive_t *drive, u16 *id)
-{
-       u8 gcw[2];
-       u8 device_type, protocol, removable, drq_type, packet_size;
-
-       *((u16 *)&gcw) = id[ATA_ID_CONFIG];
-
-       device_type =  gcw[1] & 0x1F;
-       removable   = (gcw[0] & 0x80) >> 7;
-       protocol    = (gcw[1] & 0xC0) >> 6;
-       drq_type    = (gcw[0] & 0x60) >> 5;
-       packet_size =  gcw[0] & 0x03;
-
-#ifdef CONFIG_PPC
-       /* kludge for Apple PowerBook internal zip */
-       if (device_type == 5 &&
-           !strstr((char *)&id[ATA_ID_PROD], "CD-ROM") &&
-           strstr((char *)&id[ATA_ID_PROD], "ZIP"))
-               device_type = 0;
-#endif
-
-       if (protocol != 2)
-               printk(KERN_ERR "ide-floppy: Protocol (0x%02x) is not ATAPI\n",
-                       protocol);
-       else if (device_type != 0)
-               printk(KERN_ERR "ide-floppy: Device type (0x%02x) is not set "
-                               "to floppy\n", device_type);
-       else if (!removable)
-               printk(KERN_ERR "ide-floppy: The removable flag is not set\n");
-       else if (drq_type == 3)
-               printk(KERN_ERR "ide-floppy: Sorry, DRQ type (0x%02x) not "
-                               "supported\n", drq_type);
-       else if (packet_size != 0)
-               printk(KERN_ERR "ide-floppy: Packet size (0x%02x) is not 12 "
-                               "bytes\n", packet_size);
-       else
-               return 1;
-       return 0;
-}
-
 #ifdef CONFIG_IDE_PROC_FS
 ide_devset_rw(bios_cyl,  0, 1023, bios_cyl);
 ide_devset_rw(bios_head, 0,  255, bios_head);
@@ -1041,7 +927,7 @@ static void idefloppy_setup(ide_drive_t *drive, idefloppy_floppy_t *floppy)
        u8 gcw[2];
 
        *((u16 *)&gcw) = id[ATA_ID_CONFIG];
-       floppy->pc = floppy->pc_stack;
+
        drive->pc_callback = ide_floppy_callback;
 
        if (((gcw[0] & 0x60) >> 5) == 1)
@@ -1130,7 +1016,6 @@ static ide_driver_t idefloppy_driver = {
        .remove                 = ide_floppy_remove,
        .version                = IDEFLOPPY_VERSION,
        .media                  = ide_floppy,
-       .supports_dsc_overlap   = 0,
        .do_request             = idefloppy_do_request,
        .end_request            = idefloppy_end_request,
        .error                  = __ide_error,
@@ -1140,6 +1025,17 @@ static ide_driver_t idefloppy_driver = {
 #endif
 };
 
+static void ide_floppy_set_media_lock(ide_drive_t *drive, int on)
+{
+       struct ide_atapi_pc pc;
+
+       /* IOMEGA Clik! drives do not support lock/unlock commands */
+       if ((drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE) == 0) {
+               idefloppy_create_prevent_cmd(&pc, on);
+               (void)idefloppy_queue_pc_tail(drive, &pc);
+       }
+}
+
 static int idefloppy_open(struct inode *inode, struct file *filp)
 {
        struct gendisk *disk = inode->i_bdev->bd_disk;
@@ -1162,7 +1058,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
                /* Just in case */
 
-               idefloppy_init_pc(&pc);
+               ide_init_pc(&pc);
                pc.c[0] = GPCMD_TEST_UNIT_READY;
 
                if (idefloppy_queue_pc_tail(drive, &pc)) {
@@ -1186,12 +1082,9 @@ static int idefloppy_open(struct inode *inode, struct file *filp)
                        ret = -EROFS;
                        goto out_put_floppy;
                }
+
                drive->atapi_flags |= IDE_AFLAG_MEDIA_CHANGED;
-               /* IOMEGA Clik! drives do not support lock/unlock commands */
-               if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE)) {
-                       idefloppy_create_prevent_cmd(&pc, 1);
-                       (void) idefloppy_queue_pc_tail(drive, &pc);
-               }
+               ide_floppy_set_media_lock(drive, 1);
                check_disk_change(inode->i_bdev);
        } else if (drive->atapi_flags & IDE_AFLAG_FORMAT_IN_PROGRESS) {
                ret = -EBUSY;
@@ -1210,17 +1103,11 @@ static int idefloppy_release(struct inode *inode, struct file *filp)
        struct gendisk *disk = inode->i_bdev->bd_disk;
        struct ide_floppy_obj *floppy = ide_floppy_g(disk);
        ide_drive_t *drive = floppy->drive;
-       struct ide_atapi_pc pc;
 
        debug_log("Reached %s\n", __func__);
 
        if (floppy->openers == 1) {
-               /* IOMEGA Clik! drives do not support lock/unlock commands */
-               if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE)) {
-                       idefloppy_create_prevent_cmd(&pc, 0);
-                       (void) idefloppy_queue_pc_tail(drive, &pc);
-               }
-
+               ide_floppy_set_media_lock(drive, 0);
                drive->atapi_flags &= ~IDE_AFLAG_FORMAT_IN_PROGRESS;
        }
 
@@ -1246,21 +1133,12 @@ static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,
                               unsigned long arg, unsigned int cmd)
 {
        idefloppy_floppy_t *floppy = drive->driver_data;
+       int prevent = (arg && cmd != CDROMEJECT) ? 1 : 0;
 
        if (floppy->openers > 1)
                return -EBUSY;
 
-       /* The IOMEGA Clik! Drive doesn't support this command -
-        * no room for an eject mechanism */
-       if (!(drive->atapi_flags & IDE_AFLAG_CLIK_DRIVE)) {
-               int prevent = arg ? 1 : 0;
-
-               if (cmd == CDROMEJECT)
-                       prevent = 0;
-
-               idefloppy_create_prevent_cmd(pc, prevent);
-               (void) idefloppy_queue_pc_tail(floppy->drive, pc);
-       }
+       ide_floppy_set_media_lock(drive, prevent);
 
        if (cmd == CDROMEJECT) {
                idefloppy_create_start_stop_cmd(pc, 2);
@@ -1270,11 +1148,10 @@ static int ide_floppy_lockdoor(ide_drive_t *drive, struct ide_atapi_pc *pc,
        return 0;
 }
 
-static int ide_floppy_format_unit(idefloppy_floppy_t *floppy,
-                                 int __user *arg)
+static int ide_floppy_format_unit(ide_drive_t *drive, int __user *arg)
 {
+       idefloppy_floppy_t *floppy = drive->driver_data;
        struct ide_atapi_pc pc;
-       ide_drive_t *drive = floppy->drive;
        int blocks, length, flags, err = 0;
 
        if (floppy->openers > 1) {
@@ -1319,6 +1196,24 @@ out:
        return err;
 }
 
+static int ide_floppy_format_ioctl(ide_drive_t *drive, struct file *file,
+                                  unsigned int cmd, void __user *argp)
+{
+       switch (cmd) {
+       case IDEFLOPPY_IOCTL_FORMAT_SUPPORTED:
+               return 0;
+       case IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY:
+               return ide_floppy_get_format_capacities(drive, argp);
+       case IDEFLOPPY_IOCTL_FORMAT_START:
+               if (!(file->f_mode & 2))
+                       return -EPERM;
+               return ide_floppy_format_unit(drive, (int __user *)argp);
+       case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:
+               return ide_floppy_get_format_progress(drive, argp);
+       default:
+               return -ENOTTY;
+       }
+}
 
 static int idefloppy_ioctl(struct inode *inode, struct file *file,
                        unsigned int cmd, unsigned long arg)
@@ -1330,23 +1225,12 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file,
        void __user *argp = (void __user *)arg;
        int err;
 
-       switch (cmd) {
-       case CDROMEJECT:
-               /* fall through */
-       case CDROM_LOCKDOOR:
+       if (cmd == CDROMEJECT || cmd == CDROM_LOCKDOOR)
                return ide_floppy_lockdoor(drive, &pc, arg, cmd);
-       case IDEFLOPPY_IOCTL_FORMAT_SUPPORTED:
-               return 0;
-       case IDEFLOPPY_IOCTL_FORMAT_GET_CAPACITY:
-               return ide_floppy_get_format_capacities(drive, argp);
-       case IDEFLOPPY_IOCTL_FORMAT_START:
-               if (!(file->f_mode & 2))
-                       return -EPERM;
 
-               return ide_floppy_format_unit(floppy, (int __user *)arg);
-       case IDEFLOPPY_IOCTL_FORMAT_GET_PROGRESS:
-               return idefloppy_get_format_progress(drive, argp);
-       }
+       err = ide_floppy_format_ioctl(drive, file, cmd, argp);
+       if (err != -ENOTTY)
+               return err;
 
        /*
         * skip SCSI_IOCTL_SEND_COMMAND (deprecated)
@@ -1355,8 +1239,6 @@ static int idefloppy_ioctl(struct inode *inode, struct file *file,
        if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
                err = scsi_cmd_ioctl(file, bdev->bd_disk->queue,
                                        bdev->bd_disk, cmd, argp);
-       else
-               err = -ENOTTY;
 
        if (err == -ENOTTY)
                err = generic_ide_ioctl(drive, file, bdev, cmd, arg);
@@ -1408,7 +1290,7 @@ static int ide_floppy_probe(ide_drive_t *drive)
        if (drive->media != ide_floppy)
                goto failed;
 
-       if (!idefloppy_identify_device(drive, drive->id)) {
+       if (!ide_check_atapi_device(drive, DRV_NAME)) {
                printk(KERN_ERR "ide-floppy: %s: not supported by this version"
                                " of ide-floppy\n", drive->name);
                goto failed;