Commit dec50b82 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] clean up trm290 for new ifdef style

parent 31814f4e
...@@ -176,7 +176,6 @@ static void trm290_selectproc (ide_drive_t *drive) ...@@ -176,7 +176,6 @@ static void trm290_selectproc (ide_drive_t *drive)
trm290_prepare_drive(drive, drive->using_dma); trm290_prepare_drive(drive, drive->using_dma);
} }
#ifdef CONFIG_BLK_DEV_IDEDMA
static int trm290_ide_dma_write (ide_drive_t *drive /*, struct request *rq */) static int trm290_ide_dma_write (ide_drive_t *drive /*, struct request *rq */)
{ {
ide_hwif_t *hwif = HWIF(drive); ide_hwif_t *hwif = HWIF(drive);
...@@ -297,7 +296,6 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive) ...@@ -297,7 +296,6 @@ static int trm290_ide_dma_test_irq (ide_drive_t *drive)
status = hwif->INW(hwif->dma_status); status = hwif->INW(hwif->dma_status);
return (status == 0x00ff); return (status == 0x00ff);
} }
#endif /* CONFIG_BLK_DEV_IDEDMA */
/* /*
* Invoked from ide-dma.c at boot time. * Invoked from ide-dma.c at boot time.
...@@ -344,13 +342,11 @@ void __init init_hwif_trm290 (ide_hwif_t *hwif) ...@@ -344,13 +342,11 @@ void __init init_hwif_trm290 (ide_hwif_t *hwif)
ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3); ide_setup_dma(hwif, (hwif->config_data + 4) ^ (hwif->channel ? 0x0080 : 0x0000), 3);
#ifdef CONFIG_BLK_DEV_IDEDMA
hwif->ide_dma_write = &trm290_ide_dma_write; hwif->ide_dma_write = &trm290_ide_dma_write;
hwif->ide_dma_read = &trm290_ide_dma_read; hwif->ide_dma_read = &trm290_ide_dma_read;
hwif->ide_dma_begin = &trm290_ide_dma_begin; hwif->ide_dma_begin = &trm290_ide_dma_begin;
hwif->ide_dma_end = &trm290_ide_dma_end; hwif->ide_dma_end = &trm290_ide_dma_end;
hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq; hwif->ide_dma_test_irq = &trm290_ide_dma_test_irq;
#endif /* CONFIG_BLK_DEV_IDEDMA */
hwif->selectproc = &trm290_selectproc; hwif->selectproc = &trm290_selectproc;
hwif->autodma = 0; /* play it safe for now */ hwif->autodma = 0; /* play it safe for now */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment