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/macide.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/macide.c')
-rw-r--r-- | drivers/ide/macide.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/macide.c b/drivers/ide/macide.c index 4b1718e83283..3af9e96da617 100644 --- a/drivers/ide/macide.c +++ b/drivers/ide/macide.c | |||
@@ -76,13 +76,12 @@ static void __init macide_setup_ports(hw_regs_t *hw, unsigned long base, | |||
76 | 76 | ||
77 | hw->irq = irq; | 77 | hw->irq = irq; |
78 | hw->ack_intr = ack_intr; | 78 | hw->ack_intr = ack_intr; |
79 | |||
80 | hw->chipset = ide_generic; | ||
81 | } | 79 | } |
82 | 80 | ||
83 | static const struct ide_port_info macide_port_info = { | 81 | static const struct ide_port_info macide_port_info = { |
84 | .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, | 82 | .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA, |
85 | .irq_flags = IRQF_SHARED, | 83 | .irq_flags = IRQF_SHARED, |
84 | .chipset = ide_generic, | ||
86 | }; | 85 | }; |
87 | 86 | ||
88 | static const char *mac_ide_name[] = | 87 | static const char *mac_ide_name[] = |