android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "driver core: add a min_align_mask field to struct device_dma_parameters"

Browse Source 
This reverts commit 2e8b3b0b8e.

Fixes the ABI issues in 5.10.35 that at the moment, we can't handle due
to the KABI freeze.  These are not patches that mean much for android
systems, and will be reverted the next KABI "reset" point.

Bug: 161946584
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I03a41fc3ba455ded7274f2a6b5566bb369a75a86
This commit is contained in:
Greg Kroah-Hartman 2021-05-08 13:01:42 +02:00
parent 17ba7dfe20
commit 0ddd59c5da
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/device.h
View File

@ -291,7 +291,6 @@ struct device_dma_parameters {
* sg limitations. * sg limitations.
*/ */
unsigned int max_segment_size; unsigned int max_segment_size;
unsigned int min_align_mask;
unsigned long segment_boundary_mask; unsigned long segment_boundary_mask;
}; };

16
include/linux/dma-mapping.h
View File

@ -517,22 +517,6 @@ static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask)
return -EIO; return -EIO;
} }
static inline unsigned int dma_get_min_align_mask(struct device *dev)
{
if (dev->dma_parms)
return dev->dma_parms->min_align_mask;
return 0;
}
static inline int dma_set_min_align_mask(struct device *dev,
unsigned int min_align_mask)
{
if (WARN_ON_ONCE(!dev->dma_parms))
return -EIO;
dev->dma_parms->min_align_mask = min_align_mask;
return 0;
}
static inline int dma_get_cache_alignment(void) static inline int dma_get_cache_alignment(void)
{ {
#ifdef ARCH_DMA_MINALIGN #ifdef ARCH_DMA_MINALIGN