diff options
Diffstat (limited to 'drivers/ide/pci/cy82c693.c')
-rw-r--r-- | drivers/ide/pci/cy82c693.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c index 08eab7e7f051..e30eae5a01b6 100644 --- a/drivers/ide/pci/cy82c693.c +++ b/drivers/ide/pci/cy82c693.c | |||
@@ -382,15 +382,6 @@ static unsigned int __devinit init_chipset_cy82c693(struct pci_dev *dev, const c | |||
382 | return 0; | 382 | return 0; |
383 | } | 383 | } |
384 | 384 | ||
385 | /* | ||
386 | * the init function - called for each ide channel once | ||
387 | */ | ||
388 | static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif) | ||
389 | { | ||
390 | hwif->set_pio_mode = &cy82c693_set_pio_mode; | ||
391 | hwif->set_dma_mode = &cy82c693_set_dma_mode; | ||
392 | } | ||
393 | |||
394 | static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) | 385 | static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) |
395 | { | 386 | { |
396 | static ide_hwif_t *primary; | 387 | static ide_hwif_t *primary; |
@@ -404,11 +395,16 @@ static void __devinit init_iops_cy82c693(ide_hwif_t *hwif) | |||
404 | } | 395 | } |
405 | } | 396 | } |
406 | 397 | ||
398 | static const struct ide_port_ops cy82c693_port_ops = { | ||
399 | .set_pio_mode = cy82c693_set_pio_mode, | ||
400 | .set_dma_mode = cy82c693_set_dma_mode, | ||
401 | }; | ||
402 | |||
407 | static const struct ide_port_info cy82c693_chipset __devinitdata = { | 403 | static const struct ide_port_info cy82c693_chipset __devinitdata = { |
408 | .name = "CY82C693", | 404 | .name = "CY82C693", |
409 | .init_chipset = init_chipset_cy82c693, | 405 | .init_chipset = init_chipset_cy82c693, |
410 | .init_iops = init_iops_cy82c693, | 406 | .init_iops = init_iops_cy82c693, |
411 | .init_hwif = init_hwif_cy82c693, | 407 | .port_ops = &cy82c693_port_ops, |
412 | .chipset = ide_cy82c693, | 408 | .chipset = ide_cy82c693, |
413 | .host_flags = IDE_HFLAG_SINGLE, | 409 | .host_flags = IDE_HFLAG_SINGLE, |
414 | .pio_mask = ATA_PIO4, | 410 | .pio_mask = ATA_PIO4, |