Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

alim15x3: disable init_hwif_ali15x3 for PowerPC

We don't need init_hwif_ali15x3() on the PowerPC systems either.

Before:

ALI15X3: IDE controller (0x10b9:0x5229 rev 0xc8) at PCI slot 0001:03:1f.0
ALI15X3: 100% native mode on irq 19
ide0: BM-DMA at 0x1120-0x1127
ide1: BM-DMA at 0x1128-0x112f
hda: SONY DVD RW AW-Q170A, ATAPI CD/DVD-ROM drive
hda: UDMA/66 mode selected
ide0: Disabled unable to get IRQ 14.
ide0: failed to initialize IDE interface
ide1: Disabled unable to get IRQ 15.
ide1: failed to initialize IDE interface

After:

ALI15X3: IDE controller (0x10b9:0x5229 rev 0xc8) at PCI slot 0001:03:1f.0
ALI15X3: 100% native mode on irq 19
ide0: BM-DMA at 0x1120-0x1127
ide1: BM-DMA at 0x1128-0x112f
hda: SONY DVD RW AW-Q170A, ATAPI CD/DVD-ROM drive
hda: UDMA/66 mode selected
ide0 at 0x1100-0x1107,0x110a on irq 19
ide1 at 0x1110-0x1117,0x111a on irq 19
hda: ATAPI 48X DVD-ROM DVD-R CD-R/RW drive, 2048kB Cache

ide0 works well, though I can't test ide1, it isn't traced out on
the board.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

authored by

Anton Vorontsov and committed by
Bartlomiej Zolnierkiewicz
6d1cee44 b26b0c59

+5 -5
+5 -5
drivers/ide/pci/alim15x3.c
··· 412 412 return cbl; 413 413 } 414 414 415 - #ifndef CONFIG_SPARC64 415 + #if !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC) 416 416 /** 417 417 * init_hwif_ali15x3 - Initialize the ALI IDE x86 stuff 418 418 * @hwif: interface to configure 419 419 * 420 420 * Obtain the IRQ tables for an ALi based IDE solution on the PC 421 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 425 425 static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) ··· 463 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 471 * init_dma_ali15x3 - set up DMA on ALi15x3 ··· 519 517 static const struct ide_port_info ali15x3_chipset __devinitdata = { 520 518 .name = "ALI15X3", 521 519 .init_chipset = init_chipset_ali15x3, 522 - #ifndef CONFIG_SPARC64 523 520 .init_hwif = init_hwif_ali15x3, 524 - #endif 525 521 .init_dma = init_dma_ali15x3, 526 522 .port_ops = &ali_port_ops, 527 523 .pio_mask = ATA_PIO5,