ide: add IDE_HFLAG_NO_{IO32_BIT,UNMASK_IRQS} host flags

* Use the same bit for IDE_HFLAG_CS5520 and IDE_HFLAG_VDMA host flags
  (both are used only by cs5520 host driver currently).

* Add IDE_HFLAG_NO_IO32_BIT host flag and use it instead of ->no_io_32bit
  ide_hwif_t field.

* Add IDE_HFLAG_NO_UNMASK_IRQS host flag, then convert dtc2278 and rz1000
  host drivers to use it.

There should be no functionality changes caused by this patch.

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

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index 7cbf2f1f35f9..73396f70f2b7 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -89,7 +89,10 @@ static void dtc2278_set_pio_mode(ide_drive_t *drive, const u8 pio)
 static const struct ide_port_info dtc2278_port_info __initdata = {
         .chipset                = ide_dtc2278,
         .host_flags             = IDE_HFLAG_SERIALIZE |
+                                  IDE_HFLAG_NO_UNMASK_IRQS |
                                   IDE_HFLAG_IO_32BIT |
+                                  /* disallow ->io_32bit changes */
+                                  IDE_HFLAG_NO_IO_32BIT |
                                   IDE_HFLAG_NO_DMA |
                                   IDE_HFLAG_NO_AUTOTUNE,
         .pio_mask               = ATA_PIO4,
@@ -125,14 +128,7 @@ static int __init dtc2278_probe(void)
 #endif
         local_irq_restore(flags);
 
-        hwif->no_io_32bit = 1;  /* disallow ->io_32bit changes */
         hwif->set_pio_mode = &dtc2278_set_pio_mode;
-        hwif->drives[0].no_unmask = 1;
-        hwif->drives[1].no_unmask = 1;
-
-        mate->no_io_32bit = 1;
-        mate->drives[0].no_unmask = 1;
-        mate->drives[1].no_unmask = 1;
 
         ide_device_add(idx, &dtc2278_port_info);