Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

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

diff --git a/include/linux/device.h b/include/linux/device.h
index f05c5b92e61f535abcfd1d11fd6e8165a8ae840f..e226030c1df3c3f1c333f2acba8955a116921cf6 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1213,8 +1213,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.
  * @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.
  * @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.


@@ -1300,7 +1300,7 @@ struct device {
                                             not all hardware supports
                                             64 bit addresses for consistent
                                             allocations such descriptors. */
                                             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;
        unsigned long   dma_pfn_offset;
 
        struct device_dma_parameters *dma_parms;