From: Sergei Shtylylov Remove 'dma_base2' field from 'ide_hwif_t' as it's used only by 2 drivers and without a great need. Signed-off-by: Sergei Shtylyov Cc: Bartlomiej Zolnierkiewicz Cc: Alan Cox Signed-off-by: Andrew Morton --- drivers/ide/ide-dma.c | 14 +------------- drivers/ide/pci/sgiioc4.c | 22 ++++++++++------------ drivers/ide/pci/siimage.c | 4 +--- include/linux/ide.h | 1 - 4 files changed, 12 insertions(+), 29 deletions(-) diff -puN drivers/ide/ide-dma.c~ide-remove-dma_base2-field-form-ide_hwif_t drivers/ide/ide-dma.c --- devel/drivers/ide/ide-dma.c~ide-remove-dma_base2-field-form-ide_hwif_t 2006-05-19 16:01:44.000000000 -0700 +++ devel-akpm/drivers/ide/ide-dma.c 2006-05-19 16:01:44.000000000 -0700 @@ -802,8 +802,6 @@ static int ide_release_iomio_dma(ide_hwi release_region(hwif->dma_base, 8); if (hwif->extra_ports) release_region(hwif->extra_base, hwif->extra_ports); - if (hwif->dma_base2) - release_region(hwif->dma_base, 8); return 1; } @@ -877,19 +875,9 @@ static int ide_iomio_dma(ide_hwif_t *hwi } if(hwif->mate) - hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base : base; + hwif->dma_master = (hwif->channel) ? hwif->mate->dma_base:base; else hwif->dma_master = base; - if (hwif->dma_base2) { - if (!request_region(hwif->dma_base2, ports, hwif->name)) - { - printk(" -- Error, secondary ports in use.\n"); - release_region(base, ports); - if (hwif->extra_ports) - release_region(hwif->extra_base, hwif->extra_ports); - return 1; - } - } return 0; } diff -puN drivers/ide/pci/sgiioc4.c~ide-remove-dma_base2-field-form-ide_hwif_t drivers/ide/pci/sgiioc4.c --- devel/drivers/ide/pci/sgiioc4.c~ide-remove-dma_base2-field-form-ide_hwif_t 2006-05-19 16:01:44.000000000 -0700 +++ devel-akpm/drivers/ide/pci/sgiioc4.c 2006-05-19 16:01:44.000000000 -0700 @@ -220,7 +220,7 @@ sgiioc4_ide_dma_end(ide_drive_t * drive) ide_hwif_t *hwif = HWIF(drive); u64 dma_base = hwif->dma_base; int dma_stat = 0; - unsigned long *ending_dma = (unsigned long *) hwif->dma_base2; + unsigned long *ending_dma = ide_get_hwifdata(hwif); hwif->OUTL(IOC4_S_DMA_STOP, dma_base + IOC4_DMA_CTRL * 4); @@ -367,7 +367,8 @@ sgiioc4_INB(unsigned long port) static void __devinit ide_dma_sgiioc4(ide_hwif_t * hwif, unsigned long dma_base) { - int num_ports = sizeof (ioc4_dma_regs_t); + int num_ports = sizeof(ioc4_dma_regs_t); + void *pad; printk(KERN_INFO "%s: BM-DMA at 0x%04lx-0x%04lx\n", hwif->name, dma_base, dma_base + num_ports - 1); @@ -391,17 +392,14 @@ ide_dma_sgiioc4(ide_hwif_t * hwif, unsig hwif->sg_max_nents = IOC4_PRD_ENTRIES; - hwif->dma_base2 = (unsigned long) - pci_alloc_consistent(hwif->pci_dev, - IOC4_IDE_CACHELINE_SIZE, - (dma_addr_t *) &(hwif->dma_status)); + pad = pci_alloc_consistent(hwif->pci_dev, IOC4_IDE_CACHELINE_SIZE, + (dma_addr_t *) &(hwif->dma_status)); - if (!hwif->dma_base2) - goto dma_base2alloc_failure; - - return; + if (pad) { + ide_set_hwifdata(hwif, pad); + return; + } -dma_base2alloc_failure: pci_free_consistent(hwif->pci_dev, IOC4_PRD_ENTRIES * IOC4_PRD_BYTES, hwif->dmatable_cpu, hwif->dmatable_dma); @@ -461,7 +459,7 @@ sgiioc4_configure_for_dma(int dma_direct hwif->OUTL(dma_addr, dma_base + IOC4_DMA_PTR_L * 4); /* Address of the Ending DMA */ - memset((unsigned int *) hwif->dma_base2, 0, IOC4_IDE_CACHELINE_SIZE); + memset(ide_get_hwifdata(hwif), 0, IOC4_IDE_CACHELINE_SIZE); ending_dma_addr = cpu_to_le32(hwif->dma_status); hwif->OUTL(ending_dma_addr, dma_base + IOC4_DMA_END_ADDR * 4); diff -puN drivers/ide/pci/siimage.c~ide-remove-dma_base2-field-form-ide_hwif_t drivers/ide/pci/siimage.c --- devel/drivers/ide/pci/siimage.c~ide-remove-dma_base2-field-form-ide_hwif_t 2006-05-19 16:01:44.000000000 -0700 +++ devel-akpm/drivers/ide/pci/siimage.c 2006-05-19 16:01:44.000000000 -0700 @@ -939,11 +939,9 @@ static void __devinit init_mmio_iops_sii #ifdef SIIMAGE_LARGE_DMA /* Watch the brackets - even Ken and Dennis get some language design wrong */ hwif->dma_base = base + (ch ? 0x18 : 0x10); - hwif->dma_base2 = base + (ch ? 0x08 : 0x00); - hwif->dma_prdtable = hwif->dma_base2 + 4; + hwif->dma_prdtable = base + (ch ? 0x0c : 0x04); #else /* ! SIIMAGE_LARGE_DMA */ hwif->dma_base = base + (ch ? 0x08 : 0x00); - hwif->dma_base2 = base + (ch ? 0x18 : 0x10); #endif /* SIIMAGE_LARGE_DMA */ hwif->mmio = 2; } diff -puN include/linux/ide.h~ide-remove-dma_base2-field-form-ide_hwif_t include/linux/ide.h --- devel/include/linux/ide.h~ide-remove-dma_base2-field-form-ide_hwif_t 2006-05-19 16:01:44.000000000 -0700 +++ devel-akpm/include/linux/ide.h 2006-05-19 16:01:44.000000000 -0700 @@ -773,7 +773,6 @@ typedef struct hwif_s { unsigned long dma_status; /* dma status register */ unsigned long dma_vendor3; /* dma vendor 3 register */ unsigned long dma_prdtable; /* actual prd table address */ - unsigned long dma_base2; /* extended base addr for dma ports */ unsigned long config_data; /* for use by chipset-specific code */ unsigned long select_data; /* for use by chipset-specific code */ _