diff options
author | Christoph Hellwig <hch@lst.de> | 2005-05-16 12:54:12 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-05-20 16:54:37 -0400 |
commit | 7dfa0f2673c17334c5de75a449f7bc161c9bd2c0 (patch) | |
tree | 0cb95e4fdef14b0a4decc2ebed5a2abee057db6f /drivers/scsi/aic7xxx/aic7xxx_osm.h | |
parent | dedd831081052028f35aaf924ea3d6c55109074f (diff) |
[SCSI] remove dma_mask hacks
pci_alloc_consistent is under 4G by default. Also simplify the
definition of bus_dmamap_t.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic7xxx_osm.h')
-rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h index 752022e4d4d4..9cfb46b4b15f 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h | |||
@@ -174,11 +174,7 @@ struct ahc_linux_dma_tag | |||
174 | }; | 174 | }; |
175 | typedef struct ahc_linux_dma_tag* bus_dma_tag_t; | 175 | typedef struct ahc_linux_dma_tag* bus_dma_tag_t; |
176 | 176 | ||
177 | struct ahc_linux_dmamap | 177 | typedef dma_addr_t bus_dmamap_t; |
178 | { | ||
179 | dma_addr_t bus_addr; | ||
180 | }; | ||
181 | typedef struct ahc_linux_dmamap* bus_dmamap_t; | ||
182 | 178 | ||
183 | typedef int bus_dma_filter_t(void*, dma_addr_t); | 179 | typedef int bus_dma_filter_t(void*, dma_addr_t); |
184 | typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int); | 180 | typedef void bus_dmamap_callback_t(void *, bus_dma_segment_t *, int, int); |
@@ -479,7 +475,6 @@ struct ahc_platform_data { | |||
479 | uint32_t irq; /* IRQ for this adapter */ | 475 | uint32_t irq; /* IRQ for this adapter */ |
480 | uint32_t bios_address; | 476 | uint32_t bios_address; |
481 | uint32_t mem_busaddr; /* Mem Base Addr */ | 477 | uint32_t mem_busaddr; /* Mem Base Addr */ |
482 | uint64_t hw_dma_mask; | ||
483 | ahc_linux_softc_flags flags; | 478 | ahc_linux_softc_flags flags; |
484 | }; | 479 | }; |
485 | 480 | ||