diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:25 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:25 -0500 |
commit | 2ad1e558a2305c2b3d5099ee2f4a5929307c20ca (patch) | |
tree | 79a530648cc26184c3b2e3933c0ebad614329b5b /drivers/ide/ide-dma.c | |
parent | 0ecdca26e556eae9668ce6de9554757dddb942ef (diff) |
ide: convert ide_hwif_t.mmio into flag (v2)
All users of ->mmio == 1 are gone so convert ->mmio into flag.
Noticed by Alan Cox.
v2:
* updated for scc_pata
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-dma.c')
-rw-r--r-- | drivers/ide/ide-dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index b7b663ee7343..1a288e5307d3 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -565,7 +565,7 @@ int ide_dma_setup(ide_drive_t *drive) | |||
565 | } | 565 | } |
566 | 566 | ||
567 | /* PRD table */ | 567 | /* PRD table */ |
568 | if (hwif->mmio == 2) | 568 | if (hwif->mmio) |
569 | writel(hwif->dmatable_dma, (void __iomem *)hwif->dma_prdtable); | 569 | writel(hwif->dmatable_dma, (void __iomem *)hwif->dma_prdtable); |
570 | else | 570 | else |
571 | outl(hwif->dmatable_dma, hwif->dma_prdtable); | 571 | outl(hwif->dmatable_dma, hwif->dma_prdtable); |
@@ -815,7 +815,7 @@ int ide_release_dma(ide_hwif_t *hwif) | |||
815 | { | 815 | { |
816 | ide_release_dma_engine(hwif); | 816 | ide_release_dma_engine(hwif); |
817 | 817 | ||
818 | if (hwif->mmio == 2) | 818 | if (hwif->mmio) |
819 | return 1; | 819 | return 1; |
820 | else | 820 | else |
821 | return ide_release_iomio_dma(hwif); | 821 | return ide_release_iomio_dma(hwif); |
@@ -884,9 +884,9 @@ static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base, unsigned int port | |||
884 | 884 | ||
885 | static int ide_dma_iobase(ide_hwif_t *hwif, unsigned long base, unsigned int ports) | 885 | static int ide_dma_iobase(ide_hwif_t *hwif, unsigned long base, unsigned int ports) |
886 | { | 886 | { |
887 | if (hwif->mmio == 2) | 887 | if (hwif->mmio) |
888 | return ide_mapped_mmio_dma(hwif, base,ports); | 888 | return ide_mapped_mmio_dma(hwif, base,ports); |
889 | BUG_ON(hwif->mmio == 1); | 889 | |
890 | return ide_iomio_dma(hwif, base, ports); | 890 | return ide_iomio_dma(hwif, base, ports); |
891 | } | 891 | } |
892 | 892 | ||