ide: remove write-only hwif->hw

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

2 files changed, 8 insertions, 11 deletions

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index be43024a359c..97af57a714cd 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -601,9 +601,9 @@ static int au_ide_probe(struct device *dev)
         _auide_hwif *ahwif = &auide_hwif;
         ide_hwif_t *hwif;
         struct resource *res;
-        hw_regs_t *hw;
         int ret = 0;
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
+        hw_regs_t hw;
 
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
         char *mode = "MWDMA2";
@@ -645,12 +645,12 @@ static int au_ide_probe(struct device *dev)
         /* FIXME:  This might possibly break PCMCIA IDE devices */
 
         hwif                            = &ide_hwifs[pdev->id];
-        hw                              = &hwif->hw;
-        hwif->irq = hw->irq             = ahwif->irq;
+        hwif->irq                       = ahwif->irq;
         hwif->chipset                   = ide_au1xxx;
 
-        auide_setup_ports(hw, ahwif);
-        memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports));
+        memset(&hw, 0, sizeof(hw));
+        auide_setup_ports(&hw, ahwif);
+        memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports));
 
         hwif->ultra_mask                = 0x0;  /* Disable Ultra DMA */
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
index 6ccc51d77e88..521edd41b572 100644
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -120,14 +120,11 @@ static int __devinit swarm_ide_probe(struct device *dev)
         hwif->noprobe = 0;
 
         for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)
-                hwif->hw.io_ports[i] =
+                hwif->io_ports[i] =
                                 (unsigned long)(base + ((0x1f0 + i) << 5));
-        hwif->hw.io_ports[IDE_CONTROL_OFFSET] =
+        hwif->io_ports[IDE_CONTROL_OFFSET] =
                                 (unsigned long)(base + (0x3f6 << 5));
-        hwif->hw.irq = K_INT_GB_IDE;
-
-        memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports));
-        hwif->irq = hwif->hw.irq;
+        hwif->irq = K_INT_GB_IDE;
 
         idx[0] = hwif->index;