1 files changed, 78 insertions, 82 deletions

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index bc5fb12b913c..9d6f62baac27 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -31,6 +31,7 @@
 #include <linux/major.h>
 #include <linux/errno.h>
 #include <linux/genhd.h>
+#include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/ide.h>
@@ -47,28 +48,13 @@
 #include <asm/unaligned.h>
 #include <linux/mtio.h>
 
-enum {
-        /* output errors only */
-        DBG_ERR =               (1 << 0),
-        /* output all sense key/asc */
-        DBG_SENSE =             (1 << 1),
-        /* info regarding all chrdev-related procedures */
-        DBG_CHRDEV =            (1 << 2),
-        /* all remaining procedures */
-        DBG_PROCS =             (1 << 3),
-};
-
 /* define to see debug info */
-#define IDETAPE_DEBUG_LOG               0
+#undef IDETAPE_DEBUG_LOG
 
-#if IDETAPE_DEBUG_LOG
-#define debug_log(lvl, fmt, args...)                    \
-{                                                       \
-        if (tape->debug_mask & lvl)                     \
-        printk(KERN_INFO "ide-tape: " fmt, ## args);    \
-}
+#ifdef IDETAPE_DEBUG_LOG
+#define ide_debug_log(lvl, fmt, args...) __ide_debug_log(lvl, fmt, ## args)
 #else
-#define debug_log(lvl, fmt, args...) do {} while (0)
+#define ide_debug_log(lvl, fmt, args...) do {} while (0)
 #endif
 
 /**************************** Tunable parameters *****************************/
@@ -170,7 +156,8 @@ typedef struct ide_tape_obj {
          * other device. Note that at most we will have only one DSC (usually
          * data transfer) request in the device request queue.
          */
-        struct request *postponed_rq;
+        bool postponed_rq;
+
         /* The time in which we started polling for DSC */
         unsigned long dsc_polling_start;
         /* Timer used to poll for dsc */
@@ -230,8 +217,6 @@ typedef struct ide_tape_obj {
         char drv_write_prot;
         /* the tape is write protected (hardware or opened as read-only) */
         char write_prot;
-
-        u32 debug_mask;
 } idetape_tape_t;
 
 static DEFINE_MUTEX(idetape_ref_mutex);
@@ -290,8 +275,9 @@ static void idetape_analyze_error(ide_drive_t *drive)
         tape->asc       = sense[12];
         tape->ascq      = sense[13];
 
-        debug_log(DBG_ERR, "pc = %x, sense key = %x, asc = %x, ascq = %x\n",
-                 pc->c[0], tape->sense_key, tape->asc, tape->ascq);
+        ide_debug_log(IDE_DBG_FUNC,
+                      "cmd: 0x%x, sense key = %x, asc = %x, ascq = %x",
+                      rq->cmd[0], tape->sense_key, tape->asc, tape->ascq);
 
         /* correct remaining bytes to transfer */
         if (pc->flags & PC_FLAG_DMA_ERROR)
@@ -344,7 +330,8 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc)
         int uptodate = pc->error ? 0 : 1;
         int err = uptodate ? 0 : IDE_DRV_ERROR_GENERAL;
 
-        debug_log(DBG_PROCS, "Enter %s\n", __func__);
+        ide_debug_log(IDE_DBG_FUNC, "cmd: 0x%x, dsc: %d, err: %d", rq->cmd[0],
+                      dsc, err);
 
         if (dsc)
                 ide_tape_handle_dsc(drive);
@@ -387,13 +374,14 @@ static int ide_tape_callback(ide_drive_t *drive, int dsc)
  * Postpone the current request so that ide.c will be able to service requests
  * from another device on the same port while we are polling for DSC.
  */
-static void idetape_postpone_request(ide_drive_t *drive)
+static void ide_tape_stall_queue(ide_drive_t *drive)
 {
         idetape_tape_t *tape = drive->driver_data;
 
-        debug_log(DBG_PROCS, "Enter %s\n", __func__);
+        ide_debug_log(IDE_DBG_FUNC, "cmd: 0x%x, dsc_poll_freq: %lu",
+                      drive->hwif->rq->cmd[0], tape->dsc_poll_freq);
 
-        tape->postponed_rq = drive->hwif->rq;
+        tape->postponed_rq = true;
 
         ide_stall_queue(drive, tape->dsc_poll_freq);
 }
@@ -407,7 +395,7 @@ static void ide_tape_handle_dsc(ide_drive_t *drive)
         tape->dsc_poll_freq = IDETAPE_DSC_MA_FAST;
         tape->dsc_timeout = jiffies + IDETAPE_DSC_MA_TIMEOUT;
         /* Allow ide.c to handle other requests */
-        idetape_postpone_request(drive);
+        ide_tape_stall_queue(drive);
 }
 
 /*
@@ -488,7 +476,8 @@ static ide_startstop_t ide_tape_issue_pc(ide_drive_t *drive,
                 ide_complete_rq(drive, -EIO, blk_rq_bytes(rq));
                 return ide_stopped;
         }
-        debug_log(DBG_SENSE, "Retry #%d, cmd = %02X\n", pc->retries, pc->c[0]);
+        ide_debug_log(IDE_DBG_SENSE, "retry #%d, cmd: 0x%02x", pc->retries,
+                      pc->c[0]);
 
         pc->retries++;
 
@@ -579,12 +568,12 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
         ide_hwif_t *hwif = drive->hwif;
         idetape_tape_t *tape = drive->driver_data;
         struct ide_atapi_pc *pc = NULL;
-        struct request *postponed_rq = tape->postponed_rq;
         struct ide_cmd cmd;
         u8 stat;
 
-        debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n"
-                  (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq));
+        ide_debug_log(IDE_DBG_RQ, "cmd: 0x%x, sector: %llu, nr_sectors: %u",
+                      rq->cmd[0], (unsigned long long)blk_rq_pos(rq),
+                      blk_rq_sectors(rq));
 
         BUG_ON(!(blk_special_request(rq) || blk_sense_request(rq)));
 
@@ -594,18 +583,6 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
                 goto out;
         }
 
-        if (postponed_rq != NULL)
-                if (rq != postponed_rq) {
-                        printk(KERN_ERR "ide-tape: ide-tape.c bug - "
-                                        "Two DSC requests were queued\n");
-                        drive->failed_pc = NULL;
-                        rq->errors = 0;
-                        ide_complete_rq(drive, 0, blk_rq_bytes(rq));
-                        return ide_stopped;
-                }
-
-        tape->postponed_rq = NULL;
-
         /*
          * If the tape is still busy, postpone our request and service
          * the other device meanwhile.
@@ -623,7 +600,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
 
         if (!(drive->atapi_flags & IDE_AFLAG_IGNORE_DSC) &&
             !(stat & ATA_DSC)) {
-                if (postponed_rq == NULL) {
+                if (!tape->postponed_rq) {
                         tape->dsc_polling_start = jiffies;
                         tape->dsc_poll_freq = tape->best_dsc_rw_freq;
                         tape->dsc_timeout = jiffies + IDETAPE_DSC_RW_TIMEOUT;
@@ -640,10 +617,12 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
                                         tape->dsc_polling_start +
                                         IDETAPE_DSC_MA_THRESHOLD))
                         tape->dsc_poll_freq = IDETAPE_DSC_MA_SLOW;
-                idetape_postpone_request(drive);
+                ide_tape_stall_queue(drive);
                 return ide_stopped;
-        } else
+        } else {
                 drive->atapi_flags &= ~IDE_AFLAG_IGNORE_DSC;
+                tape->postponed_rq = false;
+        }
 
         if (rq->cmd[13] & REQ_IDETAPE_READ) {
                 pc = &tape->queued_pc;
@@ -745,7 +724,7 @@ static int ide_tape_read_position(ide_drive_t *drive)
         struct ide_atapi_pc pc;
         u8 buf[20];
 
-        debug_log(DBG_PROCS, "Enter %s\n", __func__);
+        ide_debug_log(IDE_DBG_FUNC, "enter");
 
         /* prep cmd */
         ide_init_pc(&pc);
@@ -756,9 +735,9 @@ static int ide_tape_read_position(ide_drive_t *drive)
                 return -1;
 
         if (!pc.error) {
-                debug_log(DBG_SENSE, "BOP - %s\n",
+                ide_debug_log(IDE_DBG_FUNC, "BOP - %s",
                                 (buf[0] & 0x80) ? "Yes" : "No");
-                debug_log(DBG_SENSE, "EOP - %s\n",
+                ide_debug_log(IDE_DBG_FUNC, "EOP - %s",
                                 (buf[0] & 0x40) ? "Yes" : "No");
 
                 if (buf[0] & 0x4) {
@@ -768,8 +747,8 @@ static int ide_tape_read_position(ide_drive_t *drive)
                                   &drive->atapi_flags);
                         return -1;
                 } else {
-                        debug_log(DBG_SENSE, "Block Location - %u\n",
-                                        be32_to_cpup((__be32 *)&buf[4]));
+                        ide_debug_log(IDE_DBG_FUNC, "Block Location: %u",
+                                      be32_to_cpup((__be32 *)&buf[4]));
 
                         tape->partition = buf[1];
                         tape->first_frame = be32_to_cpup((__be32 *)&buf[4]);
@@ -866,7 +845,8 @@ static int idetape_queue_rw_tail(ide_drive_t *drive, int cmd, int size)
         struct request *rq;
         int ret;
 
-        debug_log(DBG_SENSE, "%s: cmd=%d\n", __func__, cmd);
+        ide_debug_log(IDE_DBG_FUNC, "cmd: 0x%x, size: %d", cmd, size);
+
         BUG_ON(cmd != REQ_IDETAPE_READ && cmd != REQ_IDETAPE_WRITE);
         BUG_ON(size < 0 || size % tape->blk_size);
 
@@ -1029,7 +1009,7 @@ static int idetape_rewind_tape(ide_drive_t *drive)
         struct ide_atapi_pc pc;
         int ret;
 
-        debug_log(DBG_SENSE, "Enter %s\n", __func__);
+        ide_debug_log(IDE_DBG_FUNC, "enter");
 
         idetape_create_rewind_cmd(drive, &pc);
         ret = ide_queue_pc_tail(drive, disk, &pc, NULL, 0);
@@ -1055,7 +1035,7 @@ static int idetape_blkdev_ioctl(ide_drive_t *drive, unsigned int cmd,
                 int nr_stages;
         } config;
 
-        debug_log(DBG_PROCS, "Enter %s\n", __func__);
+        ide_debug_log(IDE_DBG_FUNC, "cmd: 0x%04x", cmd);
 
         switch (cmd) {
         case 0x0340:
@@ -1085,6 +1065,9 @@ static int idetape_space_over_filemarks(ide_drive_t *drive, short mt_op,
         int retval, count = 0;
         int sprev = !!(tape->caps[4] & 0x20);
 
+
+        ide_debug_log(IDE_DBG_FUNC, "mt_op: %d, mt_count: %d", mt_op, mt_count);
+
         if (mt_count == 0)
                 return 0;
         if (MTBSF == mt_op || MTBSFM == mt_op) {
@@ -1148,7 +1131,7 @@ static ssize_t idetape_chrdev_read(struct file *file, char __user *buf,
         ssize_t ret = 0;
         int rc;
 
-        debug_log(DBG_CHRDEV, "Enter %s, count %Zd\n", __func__, count);
+        ide_debug_log(IDE_DBG_FUNC, "count %Zd", count);
 
         if (tape->chrdev_dir != IDETAPE_DIR_READ) {
                 if (test_bit(ilog2(IDE_AFLAG_DETECT_BS), &drive->atapi_flags))
@@ -1187,8 +1170,6 @@ static ssize_t idetape_chrdev_read(struct file *file, char __user *buf,
         }
 
         if (!done && test_bit(ilog2(IDE_AFLAG_FILEMARK), &drive->atapi_flags)) {
-                debug_log(DBG_SENSE, "%s: spacing over filemark\n", tape->name);
-
                 idetape_space_over_filemarks(drive, MTFSF, 1);
                 return 0;
         }
@@ -1209,7 +1190,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
         if (tape->write_prot)
                 return -EACCES;
 
-        debug_log(DBG_CHRDEV, "Enter %s, count %Zd\n", __func__, count);
+        ide_debug_log(IDE_DBG_FUNC, "count %Zd", count);
 
         /* Initialize write operation */
         rc = idetape_init_rw(drive, IDETAPE_DIR_WRITE);
@@ -1273,8 +1254,8 @@ static int idetape_mtioctop(ide_drive_t *drive, short mt_op, int mt_count)
         struct ide_atapi_pc pc;
         int i, retval;
 
-        debug_log(DBG_ERR, "Handling MTIOCTOP ioctl: mt_op=%d, mt_count=%d\n",
-                        mt_op, mt_count);
+        ide_debug_log(IDE_DBG_FUNC, "MTIOCTOP ioctl: mt_op: %d, mt_count: %d",
+                      mt_op, mt_count);
 
         switch (mt_op) {
         case MTFSF:
@@ -1393,7 +1374,7 @@ static int idetape_chrdev_ioctl(struct inode *inode, struct file *file,
         int block_offset = 0, position = tape->first_frame;
         void __user *argp = (void __user *)arg;
 
-        debug_log(DBG_CHRDEV, "Enter %s, cmd=%u\n", __func__, cmd);
+        ide_debug_log(IDE_DBG_FUNC, "cmd: 0x%x", cmd);
 
         if (tape->chrdev_dir == IDETAPE_DIR_WRITE) {
                 ide_tape_flush_merge_buffer(drive);
@@ -1461,6 +1442,9 @@ static void ide_tape_get_bsize_from_bdesc(ide_drive_t *drive)
                                 (buf[4 + 6] << 8)  +
                                  buf[4 + 7];
         tape->drv_write_prot = (buf[2] & 0x80) >> 7;
+
+        ide_debug_log(IDE_DBG_FUNC, "blk_size: %d, write_prot: %d",
+                      tape->blk_size, tape->drv_write_prot);
 }
 
 static int idetape_chrdev_open(struct inode *inode, struct file *filp)
@@ -1480,7 +1464,10 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
                 return -ENXIO;
         }
 
-        debug_log(DBG_CHRDEV, "Enter %s\n", __func__);
+        drive = tape->drive;
+        filp->private_data = tape;
+
+        ide_debug_log(IDE_DBG_FUNC, "enter");
 
         /*
          * We really want to do nonseekable_open(inode, filp); here, but some
@@ -1489,9 +1476,6 @@ static int idetape_chrdev_open(struct inode *inode, struct file *filp)
          */
         filp->f_mode &= ~(FMODE_PREAD | FMODE_PWRITE);
 
-        drive = tape->drive;
-
-        filp->private_data = tape;
 
         if (test_and_set_bit(ilog2(IDE_AFLAG_BUSY), &drive->atapi_flags)) {
                 retval = -EBUSY;
@@ -1570,7 +1554,7 @@ static int idetape_chrdev_release(struct inode *inode, struct file *filp)
         lock_kernel();
         tape = drive->driver_data;
 
-        debug_log(DBG_CHRDEV, "Enter %s\n", __func__);
+        ide_debug_log(IDE_DBG_FUNC, "enter");
 
         if (tape->chrdev_dir == IDETAPE_DIR_WRITE)
                 idetape_write_release(drive, minor);
@@ -1707,7 +1691,6 @@ static int divf_buffer_size(ide_drive_t *drive)	{ return 1024; }
 
 ide_devset_rw_flag(dsc_overlap, IDE_DFLAG_DSC_OVERLAP);
 
-ide_tape_devset_rw_field(debug_mask, debug_mask);
 ide_tape_devset_rw_field(tdsc, best_dsc_rw_freq);
 
 ide_tape_devset_r_field(avg_speed, avg_speed);
@@ -1719,7 +1702,6 @@ static const struct ide_proc_devset idetape_settings[] = {
         __IDE_PROC_DEVSET(avg_speed,    0, 0xffff, NULL, NULL),
         __IDE_PROC_DEVSET(buffer,       0, 0xffff, NULL, divf_buffer),
         __IDE_PROC_DEVSET(buffer_size,  0, 0xffff, NULL, divf_buffer_size),
-        __IDE_PROC_DEVSET(debug_mask,   0, 0xffff, NULL, NULL),
         __IDE_PROC_DEVSET(dsc_overlap,  0,      1, NULL, NULL),
         __IDE_PROC_DEVSET(speed,        0, 0xffff, NULL, NULL),
         __IDE_PROC_DEVSET(tdsc,         IDETAPE_DSC_RW_MIN, IDETAPE_DSC_RW_MAX,
@@ -1746,7 +1728,9 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor)
         int buffer_size;
         u16 *ctl = (u16 *)&tape->caps[12];
 
-        drive->pc_callback       = ide_tape_callback;
+        ide_debug_log(IDE_DBG_FUNC, "minor: %d", minor);
+
+        drive->pc_callback = ide_tape_callback;
 
         drive->dev_flags |= IDE_DFLAG_DSC_OVERLAP;
 
@@ -1833,22 +1817,32 @@ static void ide_tape_release(struct device *dev)
 }
 
 #ifdef CONFIG_IDE_PROC_FS
-static int proc_idetape_read_name
-        (char *page, char **start, off_t off, int count, int *eof, void *data)
+static int idetape_name_proc_show(struct seq_file *m, void *v)
 {
-        ide_drive_t     *drive = (ide_drive_t *) data;
+        ide_drive_t     *drive = (ide_drive_t *) m->private;
         idetape_tape_t  *tape = drive->driver_data;
-        char            *out = page;
-        int             len;
 
-        len = sprintf(out, "%s\n", tape->name);
-        PROC_IDE_READ_RETURN(page, start, off, count, eof, len);
+        seq_printf(m, "%s\n", tape->name);
+        return 0;
+}
+
+static int idetape_name_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, idetape_name_proc_show, PDE(inode)->data);
 }
 
+static const struct file_operations idetape_name_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = idetape_name_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
 static ide_proc_entry_t idetape_proc[] = {
-        { "capacity",   S_IFREG|S_IRUGO,        proc_ide_read_capacity, NULL },
-        { "name",       S_IFREG|S_IRUGO,        proc_idetape_read_name, NULL },
-        { NULL, 0, NULL, NULL }
+        { "capacity",   S_IFREG|S_IRUGO,        &ide_capacity_proc_fops },
+        { "name",       S_IFREG|S_IRUGO,        &idetape_name_proc_fops },
+        {}
 };
 
 static ide_proc_entry_t *ide_tape_proc_entries(ide_drive_t *drive)
@@ -1932,7 +1926,9 @@ static int ide_tape_probe(ide_drive_t *drive)
         struct gendisk *g;
         int minor;
 
-        if (!strstr("ide-tape", drive->driver_req))
+        ide_debug_log(IDE_DBG_FUNC, "enter");
+
+        if (!strstr(DRV_NAME, drive->driver_req))
                 goto failed;
 
         if (drive->media != ide_tape)