dma-mapping: treat dev->bus_dma_mask as a DMA limit

[sfrench/cifs-2.6.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 297239a08bb77c7474c21695a8ef406cd582e78a..e396de656f2072617293dffadb8a128d62cae9dc 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1186,8 +1186,8 @@ struct dev_links_info {
  * @coherent_dma_mask: Like dma_mask, but for alloc_coherent mapping as not all
  *             hardware supports 64-bit addresses for consistent allocations
  *             such descriptors.
- * @bus_dma_mask: Mask of an upstream bridge or bus which imposes a smaller DMA
- *             limit than the device itself supports.
+ * @bus_dma_limit: Limit of an upstream bridge or bus which imposes a smaller
+ *             DMA limit than the device itself supports.
  * @dma_pfn_offset: offset of DMA memory range relatively of RAM
  * @dma_parms: A low level driver may set these to teach IOMMU code about
  *             segment limitations.
@@ -1270,7 +1270,7 @@ struct device {
                                             not all hardware supports
                                             64 bit addresses for consistent
                                             allocations such descriptors. */
-       u64             bus_dma_mask;   /* upstream dma_mask constraint */
+       u64             bus_dma_limit;  /* upstream dma constraint */
        unsigned long   dma_pfn_offset;
 
        struct device_dma_parameters *dma_parms;