diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 13:55:56 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 13:55:56 -0400 |
commit | d6276b5f5cc7508124de291f3ed59c6945c17ae7 (patch) | |
tree | 09862ad9c2830dd3dc6fb0c395fe1836bd7fe045 /drivers/ide/ide-probe.c | |
parent | edc74b247bedb3a1f80eb6371d4171f2d49c1c77 (diff) |
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/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 21cea45e9f21..3cc8ade2cc4f 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, | |||
1689 | ide_std_init_ports(hw, base, ctl); | 1689 | ide_std_init_ports(hw, base, ctl); |
1690 | hw->irq = irq; | 1690 | hw->irq = irq; |
1691 | hw->chipset = d->chipset; | 1691 | hw->chipset = d->chipset; |
1692 | hw->config = config; | ||
1692 | 1693 | ||
1693 | hwif = ide_find_port_slot(d); | 1694 | hwif = ide_find_port_slot(d); |
1694 | if (hwif) { | 1695 | if (hwif) { |
1695 | hwif->chipset = hw->chipset; | 1696 | hwif->chipset = hw->chipset; |
1696 | 1697 | ||
1697 | if (config) | ||
1698 | hwif->config_data = config; | ||
1699 | |||
1700 | hws[port_no] = hw; | 1698 | hws[port_no] = hw; |
1701 | idx[port_no] = hwif->index; | 1699 | idx[port_no] = hwif->index; |
1702 | } | 1700 | } |