ide: cleanup setting hwif->mmio flag
PATCH 9/9 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 <[email protected]>
--- drivers/ide/arm/bast-ide.c | 1 - drivers/ide/arm/icside.c | 1 - drivers/ide/arm/ide_arm.c | 1 - drivers/ide/arm/rapide.c | 1 - drivers/ide/cris/ide-cris.c | 2 +- drivers/ide/h8300/ide-h8300.c | 1 - drivers/ide/ide-generic.c | 1 - drivers/ide/ide-pnp.c | 1 - drivers/ide/ide-probe.c | 1 - drivers/ide/legacy/buddha.c | 2 -- drivers/ide/legacy/falconide.c | 1 - drivers/ide/legacy/gayle.c | 2 -- drivers/ide/legacy/ide-4drives.c | 2 -- drivers/ide/legacy/ide_platform.c | 1 - drivers/ide/legacy/macide.c | 2 -- drivers/ide/legacy/q40ide.c | 1 - drivers/ide/mips/au1xxx-ide.c | 2 -- drivers/ide/mips/swarm.c | 3 +-- drivers/ide/pci/cmd640.c | 2 -- drivers/ide/pci/delkin_cb.c | 1 - drivers/ide/pci/sgiioc4.c | 1 - drivers/ide/ppc/mpc8xx.c | 2 -- drivers/ide/ppc/pmac.c | 2 -- 23 files changed, 2 insertions(+), 32 deletions(-)
drivers/ide/arm/bast-ide.c +0 -1
@@ -55,7 +55,6 @@ static int __init bastide_register(unsigide_init_port_data (hwif, i);ide_init_port_hw (hwif, &hw); - hwif->mmio =1 ; hwif->quirkproc =NULL ; idx[0 ] = i;
drivers/ide/arm/icside.c +0 -1
@@ -416,7 +416,6 @@ icside_setup(void __iomem *base, struct* 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;
drivers/ide/arm/ide_arm.c +0 -1
@@ -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 );
drivers/ide/arm/rapide.c +0 -1
@@ -53,7 +53,6 @@ rapide_probe(struct expansion_card *ec,ide_init_port_hw (hwif, &hw); - hwif->mmio =1 ;default_hwif_mmiops (hwif); idx[0 ] = hwif->index;
drivers/ide/cris/ide-cris.c +1 -1
@@ -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;
drivers/ide/h8300/ide-h8300.c +0 -1
@@ -74,7 +74,6 @@ static inline void hwif_setup(ide_hwif_t {default_hwif_iops (hwif); - hwif->mmio =1 ; hwif->OUTW = mm_outw; hwif->OUTSW = mm_outsw; hwif->INW = mm_inw;
drivers/ide/ide-generic.c +0 -1
@@ -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; }
drivers/ide/ide-pnp.c +0 -1
@@ -63,7 +63,6 @@ static int idepnp_probe(struct pnp_dev *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);
drivers/ide/ide-probe.c +0 -1
@@ -1657,7 +1657,6 @@ static void ide_legacy_init_one(u8 *idx, 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;
drivers/ide/legacy/buddha.c +0 -2
@@ -228,8 +228,6 @@ fail_base2:ide_init_port_data (hwif, index);ide_init_port_hw (hwif, &hw); - hwif->mmio =1 ; - idx[i] = index; } }
drivers/ide/legacy/falconide.c +0 -1
@@ -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 );
drivers/ide/legacy/gayle.c +0 -2
@@ -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);
drivers/ide/legacy/ide-4drives.c +0 -2
@@ -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) {
drivers/ide/legacy/ide_platform.c +0 -1
@@ -100,7 +100,6 @@ static int __devinit plat_ide_probe(stru hw.dev = &pdev->dev;ide_init_port_hw (hwif, &hw); - hwif->mmio =1 ;if (mmio)default_hwif_mmiops (hwif);
drivers/ide/legacy/macide.c +0 -2
@@ -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 ); }
drivers/ide/legacy/q40ide.c +0 -1
@@ -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; }
drivers/ide/mips/au1xxx-ide.c +0 -2
@@ -628,8 +628,6 @@ static int au_ide_probe(struct device *d 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 */
drivers/ide/mips/swarm.c +1 -2
@@ -110,8 +110,7 @@ static int __devinit swarm_ide_probe(str/* 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++)
drivers/ide/pci/cmd640.c +0 -2
@@ -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",
drivers/ide/pci/delkin_cb.c +0 -1
@@ -93,7 +93,6 @@ delkin_cb_probe (struct pci_dev *dev, coide_init_port_data (hwif, i);ide_init_port_hw (hwif, &hw); - hwif->mmio =1 ; hwif->port_ops = &delkin_cb_port_ops; idx[0 ] = i;
drivers/ide/pci/sgiioc4.c +0 -1
@@ -551,7 +551,6 @@ static int sgiioc4_ide_dma_setup(ide_dristatic void __devinit ide_init_sgiioc4 (ide_hwif_t * hwif) { - hwif->mmio =1 ; hwif->INB = &sgiioc4_INB;if (hwif->dma_base ==0 )
drivers/ide/ppc/mpc8xx.c +0 -2
@@ -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;
drivers/ide/ppc/pmac.c +0 -2
@@ -1045,8 +1045,6 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pdefault_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 ;