Commit 9df1b883 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds

[PATCH] ide-dma.c: remove unused/obsoleted code for hwif->mmio == 1

All users of hwif->mmio correctly handle resources themselves
(hwif->mmio == 2) so remove ide_mmio_dma() and ide_release_mmio_dma().
parent 4f25201a
...@@ -883,16 +883,6 @@ int ide_release_dma_engine (ide_hwif_t *hwif) ...@@ -883,16 +883,6 @@ int ide_release_dma_engine (ide_hwif_t *hwif)
return 1; return 1;
} }
int ide_release_mmio_dma (ide_hwif_t *hwif)
{
if ((hwif->dma_extra) && (hwif->channel == 0))
release_mem_region((hwif->dma_base + 16), hwif->dma_extra);
release_mem_region(hwif->dma_base, 8);
if (hwif->dma_base2)
release_mem_region(hwif->dma_base, 8);
return 1;
}
int ide_release_iomio_dma (ide_hwif_t *hwif) int ide_release_iomio_dma (ide_hwif_t *hwif)
{ {
if ((hwif->dma_extra) && (hwif->channel == 0)) if ((hwif->dma_extra) && (hwif->channel == 0))
...@@ -914,8 +904,6 @@ int ide_release_dma (ide_hwif_t *hwif) ...@@ -914,8 +904,6 @@ int ide_release_dma (ide_hwif_t *hwif)
return 1; return 1;
ide_release_dma_engine(hwif); ide_release_dma_engine(hwif);
if (hwif->mmio == 1)
return ide_release_mmio_dma(hwif);
return ide_release_iomio_dma(hwif); return ide_release_iomio_dma(hwif);
} }
...@@ -939,38 +927,6 @@ int ide_allocate_dma_engine (ide_hwif_t *hwif) ...@@ -939,38 +927,6 @@ int ide_allocate_dma_engine (ide_hwif_t *hwif)
return 1; return 1;
} }
int ide_mmio_dma (ide_hwif_t *hwif, unsigned long base, unsigned int ports)
{
printk(KERN_INFO " %s: MMIO-DMA at 0x%08lx-0x%08lx",
hwif->name, base, base + ports - 1);
if (!request_mem_region(base, ports, hwif->name))
goto fail;
hwif->dma_base = base;
if ((hwif->cds->extra) && (hwif->channel == 0)) {
if (!request_region(base+16, hwif->cds->extra, hwif->cds->name))
goto release_mem;
hwif->dma_extra = hwif->cds->extra;
}
if(hwif->mate)
hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base : base;
else
hwif->dma_master = base;
if (hwif->dma_base2) {
if (!request_mem_region(hwif->dma_base2, ports, hwif->name))
goto release_io;
}
return 0;
release_mem:
release_mem_region(base, ports);
release_io:
release_region(base+16, hwif->cds->extra);
fail:
printk(" -- Error, MMIO ports already in use.\n");
return 1;
}
int ide_mapped_mmio_dma (ide_hwif_t *hwif, unsigned long base, unsigned int ports) int ide_mapped_mmio_dma (ide_hwif_t *hwif, unsigned long base, unsigned int ports)
{ {
printk(KERN_INFO " %s: MMIO-DMA ", hwif->name); printk(KERN_INFO " %s: MMIO-DMA ", hwif->name);
...@@ -1022,8 +978,7 @@ int ide_dma_iobase (ide_hwif_t *hwif, unsigned long base, unsigned int ports) ...@@ -1022,8 +978,7 @@ int ide_dma_iobase (ide_hwif_t *hwif, unsigned long base, unsigned int ports)
{ {
if (hwif->mmio == 2) if (hwif->mmio == 2)
return ide_mapped_mmio_dma(hwif, base,ports); return ide_mapped_mmio_dma(hwif, base,ports);
if (hwif->mmio == 1) BUG_ON(hwif->mmio == 1);
return ide_mmio_dma(hwif, base, ports);
return ide_iomio_dma(hwif, base, ports); return ide_iomio_dma(hwif, base, ports);
} }
......
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