diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-19 18:32:33 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-19 18:32:33 -0400 |
commit | 9239b333939dd1e5b1a9f033a1c136273d58efe8 (patch) | |
tree | c7eb49e04a549ea709cd98ddf6df66a091a062d6 /drivers/ide/ppc/pmac.c | |
parent | 18e181fe13b7340194d09e6dd7f571a5f96f0367 (diff) |
ide: remove write-only hwif->hw
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 959afe47c374..816b5311dad6 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1040,6 +1040,7 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1040 | struct device_node *np = pmif->node; | 1040 | struct device_node *np = pmif->node; |
1041 | const int *bidp; | 1041 | const int *bidp; |
1042 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; | 1042 | u8 idx[4] = { 0xff, 0xff, 0xff, 0xff }; |
1043 | hw_regs_t hw; | ||
1043 | 1044 | ||
1044 | pmif->cable_80 = 0; | 1045 | pmif->cable_80 = 0; |
1045 | pmif->broken_dma = pmif->broken_dma_warn = 0; | 1046 | pmif->broken_dma = pmif->broken_dma_warn = 0; |
@@ -1125,8 +1126,9 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif) | |||
1125 | /* Tell common code _not_ to mess with resources */ | 1126 | /* Tell common code _not_ to mess with resources */ |
1126 | hwif->mmio = 1; | 1127 | hwif->mmio = 1; |
1127 | hwif->hwif_data = pmif; | 1128 | hwif->hwif_data = pmif; |
1128 | pmac_ide_init_hwif_ports(&hwif->hw, pmif->regbase, 0, &hwif->irq); | 1129 | memset(&hw, 0, sizeof(hw)); |
1129 | memcpy(hwif->io_ports, hwif->hw.io_ports, sizeof(hwif->io_ports)); | 1130 | pmac_ide_init_hwif_ports(&hw, pmif->regbase, 0, &hwif->irq); |
1131 | memcpy(hwif->io_ports, hw.io_ports, sizeof(hwif->io_ports)); | ||
1130 | hwif->chipset = ide_pmac; | 1132 | hwif->chipset = ide_pmac; |
1131 | hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET] || pmif->mediabay; | 1133 | hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET] || pmif->mediabay; |
1132 | hwif->hold = pmif->mediabay; | 1134 | hwif->hold = pmif->mediabay; |