summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 19:55:56 +0200
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 19:55:56 +0200
commitd6276b5f5cc7508124de291f3ed59c6945c17ae7 (patch)
tree09862ad9c2830dd3dc6fb0c395fe1836bd7fe045 /drivers/ide
parentedc74b247bedb3a1f80eb6371d4171f2d49c1c77 (diff)
downloadkernel-crypto-d6276b5f5cc7508124de291f3ed59c6945c17ae7.tar.gz
kernel-crypto-d6276b5f5cc7508124de291f3ed59c6945c17ae7.tar.xz
kernel-crypto-d6276b5f5cc7508124de291f3ed59c6945c17ae7.zip
ide: add 'config' field to hw_regs_t
Add 'config' field to hw_regs_t and use it to set hwif->config_data in ide_init_port_hw(), then convert ide_legacy_init_one() to use hw->config. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-probe.c4
-rw-r--r--drivers/ide/ide.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 21cea45e9f2..3cc8ade2cc4 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1689,14 +1689,12 @@ static void ide_legacy_init_one(u8 *idx, hw_regs_t **hws, hw_regs_t *hw,
ide_std_init_ports(hw, base, ctl);
hw->irq = irq;
hw->chipset = d->chipset;
+ hw->config = config;
hwif = ide_find_port_slot(d);
if (hwif) {
hwif->chipset = hw->chipset;
- if (config)
- hwif->config_data = config;
-
hws[port_no] = hw;
idx[port_no] = hwif->index;
}
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 434dd02a4bd..961f31c648c 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -286,6 +286,7 @@ void ide_init_port_hw(ide_hwif_t *hwif, hw_regs_t *hw)
hwif->dev = hw->dev;
hwif->gendev.parent = hw->parent ? hw->parent : hw->dev;
hwif->ack_intr = hw->ack_intr;
+ hwif->config_data = hw->config;
}
/*