aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/at91_ide.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-05-17 13:12:22 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-05-17 13:12:22 -0400
commit29e52cf793ded6bece50de50e738596f94f07d9f (patch)
treed11e73ba109fd0107159fa31f65ddd58222d720d /drivers/ide/at91_ide.c
parentca1b96e00ab5d1b0838965834469a0284c81a517 (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/at91_ide.c')
-rw-r--r--drivers/ide/at91_ide.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
index 403d0e4265db..8d39cc9bdf92 100644
--- a/drivers/ide/at91_ide.c
+++ b/drivers/ide/at91_ide.c
@@ -216,6 +216,7 @@ static const struct ide_port_info at91_ide_port_info __initdata = {
216 .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA | IDE_HFLAG_SINGLE | 216 .host_flags = IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA | IDE_HFLAG_SINGLE |
217 IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_UNMASK_IRQS, 217 IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_UNMASK_IRQS,
218 .pio_mask = ATA_PIO6, 218 .pio_mask = ATA_PIO6,
219 .chipset = ide_generic,
219}; 220};
220 221
221/* 222/*
@@ -304,7 +305,6 @@ static int __init at91_ide_probe(struct platform_device *pdev)
304 ide_std_init_ports(&hw, tf_base, ctl_base + 6); 305 ide_std_init_ports(&hw, tf_base, ctl_base + 6);
305 306
306 hw.irq = board->irq_pin; 307 hw.irq = board->irq_pin;
307 hw.chipset = ide_generic;
308 hw.dev = &pdev->dev; 308 hw.dev = &pdev->dev;
309 309
310 host = ide_host_alloc(&at91_ide_port_info, hws); 310 host = ide_host_alloc(&at91_ide_port_info, hws);