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/delkin_cb.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/delkin_cb.c')
-rw-r--r-- | drivers/ide/delkin_cb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/delkin_cb.c b/drivers/ide/delkin_cb.c index f153b95619bb..a0de834a81c3 100644 --- a/drivers/ide/delkin_cb.c +++ b/drivers/ide/delkin_cb.c | |||
@@ -68,6 +68,7 @@ static const struct ide_port_info delkin_cb_port_info = { | |||
68 | IDE_HFLAG_NO_DMA, | 68 | IDE_HFLAG_NO_DMA, |
69 | .irq_flags = IRQF_SHARED, | 69 | .irq_flags = IRQF_SHARED, |
70 | .init_chipset = delkin_cb_init_chipset, | 70 | .init_chipset = delkin_cb_init_chipset, |
71 | .chipset = ide_pci, | ||
71 | }; | 72 | }; |
72 | 73 | ||
73 | static int __devinit | 74 | static int __devinit |
@@ -97,7 +98,6 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) | |||
97 | ide_std_init_ports(&hw, base + 0x10, base + 0x1e); | 98 | ide_std_init_ports(&hw, base + 0x10, base + 0x1e); |
98 | hw.irq = dev->irq; | 99 | hw.irq = dev->irq; |
99 | hw.dev = &dev->dev; | 100 | hw.dev = &dev->dev; |
100 | hw.chipset = ide_pci; /* this enables IRQ sharing */ | ||
101 | 101 | ||
102 | rc = ide_host_add(&delkin_cb_port_info, hws, &host); | 102 | rc = ide_host_add(&delkin_cb_port_info, hws, &host); |
103 | if (rc) | 103 | if (rc) |