aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ide/pci/alim15x3.c10
-rw-r--r--drivers/ide/pci/siimage.c9
2 files changed, 13 insertions, 6 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index b36a22b8c213..c1922f9cfe80 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -412,14 +412,14 @@ static u8 __devinit ali_cable_detect(ide_hwif_t *hwif)
412 return cbl; 412 return cbl;
413} 413}
414 414
415#ifndef CONFIG_SPARC64 415#if !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC)
416/** 416/**
417 * init_hwif_ali15x3 - Initialize the ALI IDE x86 stuff 417 * init_hwif_ali15x3 - Initialize the ALI IDE x86 stuff
418 * @hwif: interface to configure 418 * @hwif: interface to configure
419 * 419 *
420 * Obtain the IRQ tables for an ALi based IDE solution on the PC 420 * Obtain the IRQ tables for an ALi based IDE solution on the PC
421 * class platforms. This part of the code isn't applicable to the 421 * class platforms. This part of the code isn't applicable to the
422 * Sparc systems 422 * Sparc and PowerPC systems.
423 */ 423 */
424 424
425static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) 425static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
@@ -463,7 +463,9 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
463 hwif->irq = irq; 463 hwif->irq = irq;
464 } 464 }
465} 465}
466#endif 466#else
467#define init_hwif_ali15x3 NULL
468#endif /* !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC) */
467 469
468/** 470/**
469 * init_dma_ali15x3 - set up DMA on ALi15x3 471 * init_dma_ali15x3 - set up DMA on ALi15x3
@@ -517,9 +519,7 @@ static const struct ide_dma_ops ali_dma_ops = {
517static const struct ide_port_info ali15x3_chipset __devinitdata = { 519static const struct ide_port_info ali15x3_chipset __devinitdata = {
518 .name = "ALI15X3", 520 .name = "ALI15X3",
519 .init_chipset = init_chipset_ali15x3, 521 .init_chipset = init_chipset_ali15x3,
520#ifndef CONFIG_SPARC64
521 .init_hwif = init_hwif_ali15x3, 522 .init_hwif = init_hwif_ali15x3,
522#endif
523 .init_dma = init_dma_ali15x3, 523 .init_dma = init_dma_ali15x3,
524 .port_ops = &ali_port_ops, 524 .port_ops = &ali_port_ops,
525 .pio_mask = ATA_PIO5, 525 .pio_mask = ATA_PIO5,
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 4cf8fc54aa2a..0006b9e58567 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -737,8 +737,15 @@ static const struct ide_port_ops sil_sata_port_ops = {
737 .cable_detect = sil_cable_detect, 737 .cable_detect = sil_cable_detect,
738}; 738};
739 739
740static struct ide_dma_ops sil_dma_ops = { 740static const struct ide_dma_ops sil_dma_ops = {
741 .dma_host_set = ide_dma_host_set,
742 .dma_setup = ide_dma_setup,
743 .dma_exec_cmd = ide_dma_exec_cmd,
744 .dma_start = ide_dma_start,
745 .dma_end = __ide_dma_end,
741 .dma_test_irq = siimage_dma_test_irq, 746 .dma_test_irq = siimage_dma_test_irq,
747 .dma_timeout = ide_dma_timeout,
748 .dma_lost_irq = ide_dma_lost_irq,
742}; 749};
743 750
744#define DECLARE_SII_DEV(name_str, p_ops) \ 751#define DECLARE_SII_DEV(name_str, p_ops) \