aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-16 14:33:40 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-16 14:33:40 -0400
commitc56c5648a3bd15ff14c50f284b261140cd5b5472 (patch)
tree94cdc14616143b5a51e5dc16901c4f431bacf83f /drivers/ide/ide.c
parent63b51c6d1d63276fd320615c042f1ff5d94ebab8 (diff)
ide: set hwif->dev in ide_init_port_hw() (take 2)
* Add 'parent' field to hw_regs_t for optional parent device pointer (needed by macio PMAC IDE controllers) and set hwif->dev in ide_init_port_hw(). * Update au1xxx-ide.c, sgiioc4.c, pmac.c and setup-pci.c accordingly. v2: * Update scc_pata.c. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide.c')
-rw-r--r--drivers/ide/ide.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index b7855a13f0ef..9240888e5efd 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -297,7 +297,8 @@ void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw)
297 memcpy(&hwif->io_ports, &hw->io_ports, sizeof(hwif->io_ports)); 297 memcpy(&hwif->io_ports, &hw->io_ports, sizeof(hwif->io_ports));
298 hwif->irq = hw->irq; 298 hwif->irq = hw->irq;
299 hwif->chipset = hw->chipset; 299 hwif->chipset = hw->chipset;
300 hwif->gendev.parent = hw->dev; 300 hwif->dev = hw->dev;
301 hwif->gendev.parent = hw->parent ? hw->parent : hw->dev;
301 hwif->ack_intr = hw->ack_intr; 302 hwif->ack_intr = hw->ack_intr;
302} 303}
303EXPORT_SYMBOL_GPL(ide_init_port_hw); 304EXPORT_SYMBOL_GPL(ide_init_port_hw);