ide: add device flags

Add 'unsigned long dev_flags' to ide_drive_t and convert bitfields
to IDE_DFLAG_* flags.

While at it:
- IDE_DFLAG_ADDRESSING -> IDE_DFLAG_LBA48
- fixup some comments
- remove needless g->flags zeroing from ide*_probe()

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 18 insertions, 12 deletions

diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 2c235401aad1..103f9f161716 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -826,12 +826,13 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
          */
         stat = hwif->tp_ops->read_status(hwif);
 
-        if (!drive->dsc_overlap && !(rq->cmd[13] & REQ_IDETAPE_PC2))
+        if ((drive->dev_flags & IDE_DFLAG_DSC_OVERLAP) == 0 &&
+            (rq->cmd[13] & REQ_IDETAPE_PC2) == 0)
                 set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);
 
-        if (drive->post_reset == 1) {
+        if (drive->dev_flags & IDE_DFLAG_POST_RESET) {
                 set_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags);
-                drive->post_reset = 0;
+                drive->dev_flags &= ~IDE_DFLAG_POST_RESET;
         }
 
         if (!test_and_clear_bit(IDE_AFLAG_IGNORE_DSC, &drive->atapi_flags) &&
@@ -1354,7 +1355,7 @@ static int idetape_init_read(ide_drive_t *drive)
                  * No point in issuing this if DSC overlap isn't supported, some
                  * drives (Seagate STT3401A) will return an error.
                  */
-                if (drive->dsc_overlap) {
+                if (drive->dev_flags & IDE_DFLAG_DSC_OVERLAP) {
                         bytes_read = idetape_queue_rw_tail(drive,
                                                         REQ_IDETAPE_READ, 0,
                                                         tape->merge_bh);
@@ -1630,7 +1631,7 @@ static ssize_t idetape_chrdev_write(struct file *file, const char __user *buf,
                  * point in issuing this if DSC overlap isn't supported, some
                  * drives (Seagate STT3401A) will return an error.
                  */
-                if (drive->dsc_overlap) {
+                if (drive->dev_flags & IDE_DFLAG_DSC_OVERLAP) {
                         ssize_t retval = idetape_queue_rw_tail(drive,
                                                         REQ_IDETAPE_WRITE, 0,
                                                         tape->merge_bh);
@@ -2145,7 +2146,7 @@ static int divf_tdsc(ide_drive_t *drive)	{ return   HZ; }
 static int divf_buffer(ide_drive_t *drive)      { return    2; }
 static int divf_buffer_size(ide_drive_t *drive) { return 1024; }
 
-ide_devset_rw_field(dsc_overlap, dsc_overlap);
+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);
@@ -2192,15 +2193,19 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor)
         drive->pc_io_buffers     = ide_tape_io_buffers;
 
         spin_lock_init(&tape->lock);
-        drive->dsc_overlap = 1;
+
+        drive->dev_flags |= IDE_DFLAG_DSC_OVERLAP;
+
         if (drive->hwif->host_flags & IDE_HFLAG_NO_DSC) {
                 printk(KERN_INFO "ide-tape: %s: disabling DSC overlap\n",
                                  tape->name);
-                drive->dsc_overlap = 0;
+                drive->dev_flags &= ~IDE_DFLAG_DSC_OVERLAP;
         }
+
         /* Seagate Travan drives do not support DSC overlap. */
         if (strstr((char *)&drive->id[ATA_ID_PROD], "Seagate STT3401"))
-                drive->dsc_overlap = 0;
+                drive->dev_flags &= ~IDE_DFLAG_DSC_OVERLAP;
+
         tape->minor = minor;
         tape->name[0] = 'h';
         tape->name[1] = 't';
@@ -2247,7 +2252,7 @@ static void idetape_setup(ide_drive_t *drive, idetape_tape_t *tape, int minor)
                 (*(u16 *)&tape->caps[16] * 512) / tape->buffer_size,
                 tape->buffer_size / 1024,
                 tape->best_dsc_rw_freq * 1000 / HZ,
-                drive->using_dma ? ", DMA":"");
+                (drive->dev_flags & IDE_DFLAG_USING_DMA) ? ", DMA" : "");
 
         ide_proc_register_driver(drive, tape->driver);
 }
@@ -2271,7 +2276,7 @@ static void ide_tape_release(struct kref *kref)
 
         BUG_ON(tape->merge_bh_size);
 
-        drive->dsc_overlap = 0;
+        drive->dev_flags &= ~IDE_DFLAG_DSC_OVERLAP;
         drive->driver_data = NULL;
         device_destroy(idetape_sysfs_class, MKDEV(IDETAPE_MAJOR, tape->minor));
         device_destroy(idetape_sysfs_class,
@@ -2386,7 +2391,8 @@ static int ide_tape_probe(ide_drive_t *drive)
         if (drive->media != ide_tape)
                 goto failed;
 
-        if (drive->id_read == 1 && !ide_check_atapi_device(drive, DRV_NAME)) {
+        if ((drive->dev_flags & IDE_DFLAG_ID_READ) &&
+            ide_check_atapi_device(drive, DRV_NAME) == 0) {
                 printk(KERN_ERR "ide-tape: %s: not supported by this version of"
                                 " the driver\n", drive->name);
                 goto failed;