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/ide-h8300.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/ide-h8300.c')
-rw-r--r-- | drivers/ide/ide-h8300.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c index c06ebdc4a130..40eff6c9759c 100644 --- a/drivers/ide/ide-h8300.c +++ b/drivers/ide/ide-h8300.c | |||
@@ -73,12 +73,12 @@ static inline void hw_setup(hw_regs_t *hw) | |||
73 | hw->io_ports_array[i] = CONFIG_H8300_IDE_BASE + H8300_IDE_GAP*i; | 73 | hw->io_ports_array[i] = CONFIG_H8300_IDE_BASE + H8300_IDE_GAP*i; |
74 | hw->io_ports.ctl_addr = CONFIG_H8300_IDE_ALT; | 74 | hw->io_ports.ctl_addr = CONFIG_H8300_IDE_ALT; |
75 | hw->irq = EXT_IRQ0 + CONFIG_H8300_IDE_IRQ; | 75 | hw->irq = EXT_IRQ0 + CONFIG_H8300_IDE_IRQ; |
76 | hw->chipset = ide_generic; | ||
77 | } | 76 | } |
78 | 77 | ||
79 | static const struct ide_port_info h8300_port_info = { | 78 | static const struct ide_port_info h8300_port_info = { |
80 | .tp_ops = &h8300_tp_ops, | 79 | .tp_ops = &h8300_tp_ops, |
81 | .host_flags = IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_NO_DMA, | 80 | .host_flags = IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_NO_DMA, |
81 | .chipset = ide_generic, | ||
82 | }; | 82 | }; |
83 | 83 | ||
84 | static int __init h8300_ide_init(void) | 84 | static int __init h8300_ide_init(void) |