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/scc_pata.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/scc_pata.c')
-rw-r--r-- | drivers/ide/scc_pata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c index 5be41f25204f..9e3aef317332 100644 --- a/drivers/ide/scc_pata.c +++ b/drivers/ide/scc_pata.c | |||
@@ -567,7 +567,6 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev, | |||
567 | hw.io_ports_array[i] = ports->dma + 0x20 + i * 4; | 567 | hw.io_ports_array[i] = ports->dma + 0x20 + i * 4; |
568 | hw.irq = dev->irq; | 568 | hw.irq = dev->irq; |
569 | hw.dev = &dev->dev; | 569 | hw.dev = &dev->dev; |
570 | hw.chipset = ide_pci; | ||
571 | 570 | ||
572 | rc = ide_host_add(d, hws, &host); | 571 | rc = ide_host_add(d, hws, &host); |
573 | if (rc) | 572 | if (rc) |
@@ -823,6 +822,7 @@ static const struct ide_port_info scc_chipset __devinitdata = { | |||
823 | .host_flags = IDE_HFLAG_SINGLE, | 822 | .host_flags = IDE_HFLAG_SINGLE, |
824 | .irq_flags = IRQF_SHARED, | 823 | .irq_flags = IRQF_SHARED, |
825 | .pio_mask = ATA_PIO4, | 824 | .pio_mask = ATA_PIO4, |
825 | .chipset = ide_pci, | ||
826 | }; | 826 | }; |
827 | 827 | ||
828 | /** | 828 | /** |