ide: cleanup setting hwif->mmio flag

It is no longer needed to set hwif->mmio flag to tell IDE layer to not
manage resources so cleanup host drivers that used hwif->mmio flag only
for this purpose.

Ditto for ide_legacy_init_one().

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

diff --git a/drivers/ide/arm/bast-ide.c b/drivers/ide/arm/bast-ide.c
index 5a2b0f163e8470046ba03e4592753e58cba6dfec..d158f579bde23d7eb4786ab2c1077928bf131a46 100644 (file)
--- a/drivers/ide/arm/bast-ide.c
+++ b/drivers/ide/arm/bast-ide.c
@@ -55,7 +55,6 @@ static int __init bastide_register(unsigned int base, unsigned int aux, int irq)
                ide_init_port_data(hwif, i);
 
        ide_init_port_hw(hwif, &hw);
-       hwif->mmio = 1;
        hwif->port_ops = NULL;
 
        idx[0] = i;

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

diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index a05d3dfe256c700d1917ae534c4861a3675f4e28..4263ffd4ab20ba10839466132442fac0a1eb3ad9 100644 (file)
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -53,7 +53,6 @@ static int __init ide_arm_init(void)
        hwif = ide_find_port();
        if (hwif) {
                ide_init_port_hw(hwif, &hw);
-               hwif->mmio = 1;
                idx[0] = hwif->index;
 
                ide_device_add(idx, NULL);

diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 2c3d0ec91dc3d5053abdcb252be75695747ff1f4..c0581bd98d0d34850aedfbedd5b3fb174801f937 100644 (file)
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -53,7 +53,6 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
 
                ide_init_port_hw(hwif, &hw);
 
-               hwif->mmio = 1;
                default_hwif_mmiops(hwif);
 
                idx[0] = hwif->index;

diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index c64b4c1b8e5030c6abc997052fa70e37abc828c5..4b2c6b2caca5aff9770d1bbc95f8f42a47f16c10 100644 (file)
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -815,7 +815,7 @@ static int __init init_e100_ide(void)
                        continue;
                ide_init_port_data(hwif, hwif->index);
                ide_init_port_hw(hwif, &hw);
-               hwif->mmio = 1;
+
                hwif->ata_input_data = &cris_ide_input_data;
                hwif->ata_output_data = &cris_ide_output_data;
                hwif->atapi_input_bytes = &cris_atapi_input_bytes;

diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c
index 92b02b96d7db813b11f1d5352db61bee7db67060..0708b29cdb17e3d98becee5eb1e2915cdcf97a27 100644 (file)
--- a/drivers/ide/h8300/ide-h8300.c
+++ b/drivers/ide/h8300/ide-h8300.c
@@ -74,7 +74,6 @@ static inline void hwif_setup(ide_hwif_t *hwif)
 {
        default_hwif_iops(hwif);
 
-       hwif->mmio  = 1;
        hwif->OUTW  = mm_outw;
        hwif->OUTSW = mm_outsw;
        hwif->INW   = mm_inw;

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 12de09aaef09a8ad9f008c419dc3e14500b09de6..a6073e248f450df8e09408652024b58dcc348d95 100644 (file)
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -126,7 +126,6 @@ static int __init ide_generic_init(void)
                        ide_std_init_ports(&hw, io_addr, io_addr + 0x206);
                        hw.irq = ide_default_irq(io_addr);
                        ide_init_port_hw(hwif, &hw);
-                       hwif->mmio = 1;
 
                        idx[i] = i;
                }

diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index a0b7d170ecdb7f35cf2f03f470743d21d85b7794..10c20e9a5785e0717efb30be564237599c40e783 100644 (file)
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -63,7 +63,6 @@ static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
 
                ide_init_port_data(hwif, index);
                ide_init_port_hw(hwif, &hw);
-               hwif->mmio = 1;
 
                printk(KERN_INFO "ide%d: generic PnP IDE interface\n", index);
                pnp_set_drvdata(dev, hwif);

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4a8a482b43a3dffb69e37ae2f083c0772698f89c..c2cdeefb016c471fd6b2b34ed06251dcf3ef9a2e 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1661,7 +1661,6 @@ static void ide_legacy_init_one(u8 *idx, hw_regs_t *hw, u8 port_no,
        hwif = ide_find_port_slot(d);
        if (hwif) {
                ide_init_port_hw(hwif, hw);
-               hwif->mmio = 1;
                if (config)
                        hwif->config_data = config;
                idx[port_no] = hwif->index;

diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c
index 6956eb8f2d5f4fedb12349797bad15ec45ab40f1..f51433bce8e4df4d0f9dc484f63881fac62e9fed 100644 (file)
--- a/drivers/ide/legacy/buddha.c
+++ b/drivers/ide/legacy/buddha.c
@@ -228,8 +228,6 @@ fail_base2:
                                ide_init_port_data(hwif, index);
                                ide_init_port_hw(hwif, &hw);
 
-                               hwif->mmio = 1;
-
                                idx[i] = index;
                        }
                }

diff --git a/drivers/ide/legacy/falconide.c b/drivers/ide/legacy/falconide.c
index 8c9c9f7f54ca5121f4f7a9b02dedf34bad10ff70..5c19c422c5cc78b5ad62671287ce0a278498909a 100644 (file)
--- a/drivers/ide/legacy/falconide.c
+++ b/drivers/ide/legacy/falconide.c
@@ -89,7 +89,6 @@ static int __init falconide_init(void)
 
                ide_init_port_data(hwif, index);
                ide_init_port_hw(hwif, &hw);
-               hwif->mmio = 1;
 
                ide_get_lock(NULL, NULL);
                ide_device_add(idx, NULL);

diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index fcc8d52bf2a1acb72e58a040ab6e295d2a61a2b1..a0c9601bdaf0e307f22574c12498493355c1503a 100644 (file)
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -182,8 +182,6 @@ found:
            ide_init_port_data(hwif, index);
            ide_init_port_hw(hwif, &hw);
 
-           hwif->mmio = 1;
-
            idx[i] = index;
        } else
            release_mem_region(res_start, res_n);

diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c
index e69566284ab7b70263d8564c100e1f889e70a741..17f94d0cb539810ef934e3d2149a884a35ebc594 100644 (file)
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -43,7 +43,6 @@ static int __init ide_4drives_init(void)
        hwif = ide_find_port();
        if (hwif) {
                ide_init_port_hw(hwif, &hw);
-               hwif->mmio = 1;
                idx[0] = hwif->index;
        }
 
@@ -52,7 +51,6 @@ static int __init ide_4drives_init(void)
                ide_init_port_hw(mate, &hw);
                mate->drives[0].select.all ^= 0x20;
                mate->drives[1].select.all ^= 0x20;
-               mate->mmio = 1;
                idx[1] = mate->index;
 
                if (hwif) {

diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c
index bf240775531e90d0ba74efd0029e73ee462ecf77..822f48b05c702b5b9a177ebe559681486187271b 100644 (file)
--- a/drivers/ide/legacy/ide_platform.c
+++ b/drivers/ide/legacy/ide_platform.c
@@ -100,7 +100,6 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
        hw.dev = &pdev->dev;
 
        ide_init_port_hw(hwif, &hw);
-       hwif->mmio = 1;
 
        if (mmio)
                default_hwif_mmiops(hwif);

diff --git a/drivers/ide/legacy/macide.c b/drivers/ide/legacy/macide.c
index 7429b80cb0892c747eb46a38201dde0238f16e43..26546d0afc7f4cae440a15298b09659ed34d3952 100644 (file)
--- a/drivers/ide/legacy/macide.c
+++ b/drivers/ide/legacy/macide.c
@@ -128,8 +128,6 @@ static int __init macide_init(void)
                ide_init_port_data(hwif, index);
                ide_init_port_hw(hwif, &hw);
 
-               hwif->mmio = 1;
-
                ide_device_add(idx, NULL);
        }
 

diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index fcbff0eced1b0a80b6595183a7e1b9b3a9c3a329..f23999dd3d4617b5c20cc881a1e0f474a98ca5f1 100644 (file)
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -141,7 +141,6 @@ static int __init q40ide_init(void)
        if (hwif) {
                ide_init_port_data(hwif, hwif->index);
                ide_init_port_hw(hwif, &hw);
-               hwif->mmio = 1;
 
                idx[i] = hwif->index;
        }

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 51dddc0f154ef7df310194b0966278d350003efe..e539977b33489821f695b3f762eb9431c5c5b7e9 100644 (file)
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -624,8 +624,6 @@ static int au_ide_probe(struct device *dev)
 
        hwif->dev = dev;
 
-       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 4769ec2ff290bb5ba3366d5a075f8cc885162b84..112fe566bb9320fa830db81e7b4b0511e4a4cc78 100644 (file)
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -110,8 +110,7 @@ static int __devinit swarm_ide_probe(struct device *dev)
 
        /* Setup MMIO ops.  */
        default_hwif_mmiops(hwif);
-       /* Prevent resource map manipulation.  */
-       hwif->mmio = 1;
+
        hwif->chipset = ide_generic;
 
        for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)

diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 1a60d70936052a2569da8b1c56be7a3aae2e183e..25c2f1bd175f6639f3fbf8d17b71c8b58879e7d3 100644 (file)
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -787,7 +787,6 @@ static int __init cmd640x_init(void)
         */
        if (cmd_hwif0) {
                ide_init_port_hw(cmd_hwif0, &hw[0]);
-               cmd_hwif0->mmio = 1;
                idx[0] = cmd_hwif0->index;
        }
 
@@ -840,7 +839,6 @@ static int __init cmd640x_init(void)
         */
        if (second_port_cmd640 && cmd_hwif1) {
                ide_init_port_hw(cmd_hwif1, &hw[1]);
-               cmd_hwif1->mmio = 1;
                idx[1] = cmd_hwif1->index;
        }
        printk(KERN_INFO "cmd640: %sserialized, secondary interface %s\n",

diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c
index cb9af61da2ee3af9609644f59e9981b1d72a34e3..c7b7e0483287b8747affd5dff58b6d91b4d23cf4 100644 (file)
--- a/drivers/ide/pci/delkin_cb.c
+++ b/drivers/ide/pci/delkin_cb.c
@@ -93,7 +93,6 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
                ide_init_port_data(hwif, i);
 
        ide_init_port_hw(hwif, &hw);
-       hwif->mmio = 1;
        hwif->port_ops = &delkin_cb_port_ops;
 
        idx[0] = i;

diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 22ac0f70c423709d9901ab28dfd26c36083aed9c..e16597ddbd912d91b96981bb7f95f706fa163bf2 100644 (file)
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -551,7 +551,6 @@ static int sgiioc4_ide_dma_setup(ide_drive_t *drive)
 static void __devinit
 ide_init_sgiioc4(ide_hwif_t * hwif)
 {
-       hwif->mmio = 1;
        hwif->INB = &sgiioc4_INB;
 
        if (hwif->dma_base == 0)

diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index 0fd98489d587433e1476094b9d468e4d36726809..6d62adefd97642bacd38edb55705053c3d5209f2 100644 (file)
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -814,7 +814,6 @@ static int __init mpc8xx_ide_probe(void)
                ide_hwif_t *hwif = &ide_hwifs[0];
 
                ide_init_port_hw(hwif, &hw);
-               hwif->mmio = 1;
                hwif->pio_mask = ATA_PIO4;
                hwif->port_ops = &m8xx_port_ops;
 
@@ -826,7 +825,6 @@ static int __init mpc8xx_ide_probe(void)
                ide_hwif_t *mate = &ide_hwifs[1];
 
                ide_init_port_hw(mate, &hw);
-               mate->mmio = 1;
                mate->pio_mask = ATA_PIO4;
                mate->port_ops = &m8xx_port_ops;
 

diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 4e05839074130360002d0e26966134ac9465ce15..16869cf95e1a6501d70e31d2a16eca8ddc10ff71 100644 (file)
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1045,8 +1045,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif, hw_regs_t *hw)
        default_hwif_mmiops(hwif);
                hwif->OUTBSYNC = pmac_outbsync;
 
-       /* Tell common code _not_ to mess with resources */
-       hwif->mmio = 1;
        hwif->hwif_data = pmif;
        ide_init_port_hw(hwif, hw);
        hwif->cbl = pmif->cable_80 ? ATA_CBL_PATA80 : ATA_CBL_PATA40;