Commit 41051a141dcc67f4c5011a2ab2b547e80b9ac509
1 parent
669185e98c
Exists in
master
and in
20 other branches
ide: remove ->dma_vendor{1,3} fields from ide_hwif_t
* Use 'hwif->dma_base + {1,3}' instead of hwif->dma_vendor{1,3} in
pdc202xx_new host driver.
* Remove no longer needed ->dma_vendor{1,3} fields from ide_hwif_t.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Showing 3 changed files with 4 additions and 10 deletions Side-by-side Diff
drivers/ide/ide-dma.c
| ... | ... | @@ -858,12 +858,8 @@ |
| 858 | 858 | |
| 859 | 859 | if (!hwif->dma_command) |
| 860 | 860 | hwif->dma_command = hwif->dma_base + 0; |
| 861 | - if (!hwif->dma_vendor1) | |
| 862 | - hwif->dma_vendor1 = hwif->dma_base + 1; | |
| 863 | 861 | if (!hwif->dma_status) |
| 864 | 862 | hwif->dma_status = hwif->dma_base + 2; |
| 865 | - if (!hwif->dma_vendor3) | |
| 866 | - hwif->dma_vendor3 = hwif->dma_base + 3; | |
| 867 | 863 | if (!hwif->dma_prdtable) |
| 868 | 864 | hwif->dma_prdtable = hwif->dma_base + 4; |
| 869 | 865 |
drivers/ide/pci/pdc202xx_new.c
| ... | ... | @@ -83,8 +83,8 @@ |
| 83 | 83 | { |
| 84 | 84 | u8 value; |
| 85 | 85 | |
| 86 | - outb(index, hwif->dma_vendor1); | |
| 87 | - value = inb(hwif->dma_vendor3); | |
| 86 | + outb(index, hwif->dma_base + 1); | |
| 87 | + value = inb(hwif->dma_base + 3); | |
| 88 | 88 | |
| 89 | 89 | DBG("index[%02X] value[%02X]\n", index, value); |
| 90 | 90 | return value; |
| ... | ... | @@ -97,8 +97,8 @@ |
| 97 | 97 | */ |
| 98 | 98 | static void set_indexed_reg(ide_hwif_t *hwif, u8 index, u8 value) |
| 99 | 99 | { |
| 100 | - outb(index, hwif->dma_vendor1); | |
| 101 | - outb(value, hwif->dma_vendor3); | |
| 100 | + outb(index, hwif->dma_base + 1); | |
| 101 | + outb(value, hwif->dma_base + 3); | |
| 102 | 102 | DBG("index[%02X] value[%02X]\n", index, value); |
| 103 | 103 | } |
| 104 | 104 |
include/linux/ide.h
| ... | ... | @@ -505,9 +505,7 @@ |
| 505 | 505 | |
| 506 | 506 | unsigned long dma_base; /* base addr for dma ports */ |
| 507 | 507 | unsigned long dma_command; /* dma command register */ |
| 508 | - unsigned long dma_vendor1; /* dma vendor 1 register */ | |
| 509 | 508 | unsigned long dma_status; /* dma status register */ |
| 510 | - unsigned long dma_vendor3; /* dma vendor 3 register */ | |
| 511 | 509 | unsigned long dma_prdtable; /* actual prd table address */ |
| 512 | 510 | |
| 513 | 511 | unsigned long config_data; /* for use by chipset-specific code */ |