ide: convert ide_hwif_t.mmio into flag (v2)

All users of ->mmio == 1 are gone so convert ->mmio into flag.

Noticed by Alan Cox.

v2:
* updated for scc_pata

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

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 8a1c27f28692c02c6fee0d43899eab4d000f126d..61ce40d52f5f0c6969611b9b6c196b1c55358527 100644 (file)
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -556,7 +556,7 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e
                 * Ensure we're using MMIO
                 */
                default_hwif_mmiops(hwif);
-               hwif->mmio = 2;
+               hwif->mmio = 1;
 
                for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
                        hwif->hw.io_ports[i] = port;

diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 3058217767d62eb644efdf6253e530564e3fcbb1..9c6c49fdd2b14997d51d441b3ca9399cfd1d1f08 100644 (file)
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -46,7 +46,7 @@ rapide_locate_hwif(void __iomem *base, void __iomem *ctrl, unsigned int sz, int
        hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
        hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;
        hwif->hw.irq = hwif->irq = irq;
-       hwif->mmio = 2;
+       hwif->mmio = 1;
        default_hwif_mmiops(hwif);
 
        return hwif;

diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 7afb715b86e5b34926bb9214d19d6469c662c48b..24281176b4dcec4d37d776944a6bf93a215c7ce7 100644 (file)
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -795,7 +795,7 @@ init_e100_ide (void)
                                0, 0, cris_ide_ack_intr,
                                ide_default_irq(0));
                ide_register_hw(&hw, &hwif);
-               hwif->mmio = 2;
+               hwif->mmio = 1;
                hwif->chipset = ide_etrax100;
                hwif->tuneproc = &tune_cris_ide;
                hwif->speedproc = &speed_cris_ide;

diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index c45bfb825a377a84ad1295ad6b6e8d3b6f12c993..88750a300337dfd122509564363fcf14335f3d31 100644 (file)
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -76,7 +76,7 @@ static inline void hwif_setup(ide_hwif_t *hwif)
 {
        default_hwif_iops(hwif);
 
-       hwif->mmio  = 2;
+       hwif->mmio  = 1;
        hwif->OUTW  = mm_outw;
        hwif->OUTSW = mm_outsw;
        hwif->INW   = mm_inw;

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index b7b663ee734346edea142d6ab9d7dfec107ff70a..1a288e5307d396c3de6e8646d8e9269a080b2f14 100644 (file)
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -565,7 +565,7 @@ int ide_dma_setup(ide_drive_t *drive)
        }
 
        /* PRD table */
-       if (hwif->mmio == 2)
+       if (hwif->mmio)
                writel(hwif->dmatable_dma, (void __iomem *)hwif->dma_prdtable);
        else
                outl(hwif->dmatable_dma, hwif->dma_prdtable);
@@ -815,7 +815,7 @@ int ide_release_dma(ide_hwif_t *hwif)
 {
        ide_release_dma_engine(hwif);
 
-       if (hwif->mmio == 2)
+       if (hwif->mmio)
                return 1;
        else
                return ide_release_iomio_dma(hwif);
@@ -884,9 +884,9 @@ static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base, unsigned int port
 
 static int ide_dma_iobase(ide_hwif_t *hwif, unsigned long base, unsigned int ports)
 {
-       if (hwif->mmio == 2)
+       if (hwif->mmio)
                return ide_mapped_mmio_dma(hwif, base,ports);
-       BUG_ON(hwif->mmio == 1);
+
        return ide_iomio_dma(hwif, base, ports);
 }
 

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 92ab39d5bc25759dc42096fc5de1d46a0acd08c7..fbc6d39ace68e0c8310e86b9d67368d19dbbc598 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -389,9 +389,8 @@ int ide_hwif_request_regions(ide_hwif_t *hwif)
        unsigned long addr;
        unsigned int i;
 
-       if (hwif->mmio == 2)
+       if (hwif->mmio)
                return 0;
-       BUG_ON(hwif->mmio == 1);
        addr = hwif->io_ports[IDE_CONTROL_OFFSET];
        if (addr && !hwif_request_region(hwif, addr, 1))
                goto control_region_busy;
@@ -438,7 +437,7 @@ void ide_hwif_release_regions(ide_hwif_t *hwif)
 {
        u32 i = 0;
 
-       if (hwif->mmio == 2)
+       if (hwif->mmio)
                return;
        if (hwif->io_ports[IDE_CONTROL_OFFSET])
                release_region(hwif->io_ports[IDE_CONTROL_OFFSET], 1);

diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index 0391a3122878f14876c46e71e5ad403cd745348f..1ed224a01f79ddd24e371740cccc55a4065e26fc 100644 (file)
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -215,7 +215,7 @@ fail_base2:
                        
                        index = ide_register_hw(&hw, &hwif);
                        if (index != -1) {
-                               hwif->mmio = 2;
+                               hwif->mmio = 1;
                                printk("ide%d: ", index);
                                switch(type) {
                                case BOARD_BUDDHA:

diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index 64d42619ab06a1f7e4e4d576bd8f8ef329ff5ee8..dcfadbbf55d88e0ccbe56b0abc831a63d9ecaab8 100644 (file)
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -167,7 +167,7 @@ found:
 
        index = ide_register_hw(&hw, &hwif);
        if (index != -1) {
-           hwif->mmio = 2;
+           hwif->mmio = 1;
            switch (i) {
                case 0:
                    printk("ide%d: Gayle IDE interface (A%d style)\n", index,

diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index b1730d7e414c3ec1f53ad1dfa71bf855d8131cc0..4c0079ad52ac16a9dd95df58e9afdde2a29239bf 100644 (file)
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -141,7 +141,7 @@ void macide_init(void)
        }
 
         if (index != -1) {
-               hwif->mmio = 2;
+               hwif->mmio = 1;
                if (macintosh_config->ide_type == MAC_IDE_QUADRA)
                        printk(KERN_INFO "ide%d: Macintosh Quadra IDE interface\n", index);
                else if (macintosh_config->ide_type == MAC_IDE_PB)

diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 434a94faa3b7202792ad5c05aa60144c3c59dbf3..74f08124eabb772f2d5f80abff23e4b11bfafecf 100644 (file)
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -145,7 +145,7 @@ void q40ide_init(void)
        index = ide_register_hw(&hw, &hwif);
        // **FIXME**
        if (index != -1)
-               hwif->mmio = 2;
+               hwif->mmio = 1;
     }
 }
 

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 3c4f71afeebab4b9436e8ea6131852f6d5aa9445..b431b990426d04bd4a5900520e6b48585659341e 100644 (file)
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -708,7 +708,8 @@ static int au_ide_probe(struct device *dev)
 
        /* hold should be on in all cases */
        hwif->hold                      = 1;
-       hwif->mmio                      = 2;
+
+       hwif->mmio  = 1;
 
        /* If the user has selected DDMA assisted copies,
           then set up a few local I/O function entry points 

diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
index 09c9e7936b0dff79c5d44f84732a003f910ca2f5..81fa06851b27dadfd5c4d34c58aa38b6a276c5f4 100644 (file)
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -115,7 +115,7 @@ static int __devinit swarm_ide_probe(struct device *dev)
        /* Setup MMIO ops.  */
        default_hwif_mmiops(hwif);
        /* Prevent resource map manipulation.  */
-       hwif->mmio = 2;
+       hwif->mmio = 1;
        hwif->noprobe = 0;
 
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)

diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 2af8a71e688ea34b43c999345624b05a980db9be..083c7afe11624f3e14f90758ad1eed0f17fe2e9e 100644 (file)
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -593,7 +593,7 @@ static int sgiioc4_ide_dma_setup(ide_drive_t *drive)
 static void __devinit
 ide_init_sgiioc4(ide_hwif_t * hwif)
 {
-       hwif->mmio = 2;
+       hwif->mmio = 1;
        hwif->autodma = 1;
        hwif->atapi_dma = 1;
        hwif->ultra_mask = 0x0; /* Disable Ultra DMA */

diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 505878cc21ea65193c0e437d6589bf69188091bf..40e992af000533a97eb46d44f166d16abcda8f65 100644 (file)
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -888,7 +888,8 @@ static void __devinit init_mmio_iops_siimage(ide_hwif_t *hwif)
                base = (unsigned long) addr;
 
        hwif->dma_base                  = base + (ch ? 0x08 : 0x00);
-       hwif->mmio                      = 2;
+
+       hwif->mmio = 1;
 }
 
 static int is_dev_seagate_sata(ide_drive_t *drive)

diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index d8ea23710bf0386d25d96d7d0e2a9102c001fb47..c547c76533d56d8ae2a91ad19a2e4f6489ef6681 100644 (file)
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1237,7 +1237,7 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
                hwif->OUTBSYNC = pmac_outbsync;
 
        /* Tell common code _not_ to mess with resources */
-       hwif->mmio = 2;
+       hwif->mmio = 1;
        hwif->hwif_data = pmif;
        pmac_ide_init_hwif_ports(&hwif->hw, pmif->regbase, 0, &hwif->irq);
        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));

diff --git a/drivers/ide/ppc/scc_pata.c b/drivers/ide/ppc/scc_pata.c
index de911080374591439bdb5b40e2089538ca0ffc94..f05117e8fdb955dd56a157b0c8454bfc19acd777 100644 (file)
--- a/drivers/ide/ppc/scc_pata.c
+++ b/drivers/ide/ppc/scc_pata.c
@@ -668,7 +668,7 @@ static void __devinit init_mmio_iops_scc(ide_hwif_t *hwif)
        hwif->irq = hwif->pci_dev->irq;
        hwif->dma_base = dma_base;
        hwif->config_data = ports->ctl;
-       hwif->mmio = 2;
+       hwif->mmio = 1;
 }
 
 /**

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 4f88fb99a0531056ba46a9e18cc97bf881647bce..579a8521de6320560c5468e1cfa8b47e17d64432 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -772,7 +772,6 @@ typedef struct hwif_s {
        unsigned int cursg;
        unsigned int cursg_ofs;
 
-       int             mmio;           /* hosts iomio (0) or custom (2) select */
        int             rqsize;         /* max sectors per request */
        int             irq;            /* our irq number */
 
@@ -804,6 +803,7 @@ typedef struct hwif_s {
        unsigned        sg_mapped  : 1; /* sg_table and sg_nents are ready */
        unsigned        no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */
        unsigned        err_stops_fifo : 1; /* 1=data FIFO is cleared by an error */
+       unsigned        mmio       : 1; /* host uses MMIO */
 
        struct device   gendev;
        struct completion gendev_rel_comp; /* To deal with device release() */