IDE fixes
PATCH 1/1 IDE fixes
Linus, please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git/
to receive the following updates:
drivers/ide/pci/alim15x3.c | 10 +++++----- drivers/ide/pci/siimage.c | 9 ++++++++- 2 files changed, 13 insertions(+), 6 deletions(-)
Anton Vorontsov (1):
alim15x3: disable init_hwif_ali15x3 for PowerPC
Benjamin Herrenschmidt (1):
ide: fix crash at boot with siimage driver
drivers/ide/pci/alim15x3.c +5 -5
@@ -412,14 +412,14 @@ static u8 __devinit ali_cable_detect(ide_hwif_t *hwif)return cbl; } -#ifndef CONFIG_SPARC64 +#if !defined(CONFIG_SPARC64 ) && !defined(CONFIG_PPC )/** * init_hwif_ali15x3 - Initialize the ALI IDE x86 stuff * @hwif: interface to configure * * Obtain the IRQ tables for an ALi based IDE solution on the PC * class platforms. This part of the code isn't applicable to the -* Sparc systems +* Sparc and PowerPC systems. */ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif)
@@ -463,7 +463,9 @@ static void __devinit init_hwif_ali15x3 (ide_hwif_t *hwif) hwif->irq = irq; } } -#endif +#else +#define init_hwif_ali15x3 NULL +#endif /* !defined(CONFIG_SPARC64) && !defined(CONFIG_PPC) */ /** * init_dma_ali15x3 - set up DMA on ALi15x3
@@ -517,9 +519,7 @@ static const struct ide_dma_ops ali_dma_ops = {static const struct ide_port_info ali15x3_chipset__devinitdata = { .name ="ALI15X3" , .init_chipset = init_chipset_ali15x3, -#ifndef CONFIG_SPARC64 .init_hwif = init_hwif_ali15x3, -#endif .init_dma = init_dma_ali15x3, .port_ops = &ali_port_ops, .pio_mask =ATA_PIO5 ,
drivers/ide/pci/siimage.c +8 -1
@@ -737,8 +737,15 @@ static const struct ide_port_ops sil_sata_port_ops = { .cable_detect = sil_cable_detect, }; -static struct ide_dma_ops sil_dma_ops = { +static const struct ide_dma_ops sil_dma_ops = { + .dma_host_set = ide_dma_host_set, + .dma_setup = ide_dma_setup, + .dma_exec_cmd = ide_dma_exec_cmd, + .dma_start = ide_dma_start, + .dma_end = __ide_dma_end, .dma_test_irq = siimage_dma_test_irq, + .dma_timeout = ide_dma_timeout, + .dma_lost_irq = ide_dma_lost_irq, };#define DECLARE_SII_DEV (name_str, p_ops) \