diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-05-17 13:12:22 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-05-17 13:12:22 -0400 |
commit | 29e52cf793ded6bece50de50e738596f94f07d9f (patch) | |
tree | d11e73ba109fd0107159fa31f65ddd58222d720d /drivers/ide/rapide.c | |
parent | ca1b96e00ab5d1b0838965834469a0284c81a517 (diff) |
ide: remove chipset field from hw_regs_t
* Convert host drivers that still use hw_regs_t's chipset field to use
the one in struct ide_port_info instead.
* Move special handling of ide_pci chipset type from ide_hw_configure()
to ide_init_port().
* Remove chipset field from hw_regs_t.
While at it:
- remove stale comment in delkin_cb.c
There should be no functional changes caused by this patch.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/rapide.c')
-rw-r--r-- | drivers/ide/rapide.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/rapide.c b/drivers/ide/rapide.c index d5003ca69801..bd4d7a8a666c 100644 --- a/drivers/ide/rapide.c +++ b/drivers/ide/rapide.c | |||
@@ -13,6 +13,7 @@ | |||
13 | 13 | ||
14 | static const struct ide_port_info rapide_port_info = { | 14 | static const struct ide_port_info rapide_port_info = { |
15 | .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, | 15 | .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, |
16 | .chipset = ide_generic, | ||
16 | }; | 17 | }; |
17 | 18 | ||
18 | static void rapide_setup_ports(hw_regs_t *hw, void __iomem *base, | 19 | static void rapide_setup_ports(hw_regs_t *hw, void __iomem *base, |
@@ -49,7 +50,6 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id) | |||
49 | 50 | ||
50 | memset(&hw, 0, sizeof(hw)); | 51 | memset(&hw, 0, sizeof(hw)); |
51 | rapide_setup_ports(&hw, base, base + 0x818, 1 << 6, ec->irq); | 52 | rapide_setup_ports(&hw, base, base + 0x818, 1 << 6, ec->irq); |
52 | hw.chipset = ide_generic; | ||
53 | hw.dev = &ec->dev; | 53 | hw.dev = &ec->dev; |
54 | 54 | ||
55 | ret = ide_host_add(&rapide_port_info, hws, &host); | 55 | ret = ide_host_add(&rapide_port_info, hws, &host); |