From 0ddd59c5daf3ca9f19bef0e97f30ccef28fe0915 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sat, 8 May 2021 13:01:42 +0200 Subject: [PATCH] Revert "driver core: add a min_align_mask field to struct device_dma_parameters" This reverts commit 2e8b3b0b8e2d3b56a0b653980c62cbcb374ffedf. 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 Change-Id: I03a41fc3ba455ded7274f2a6b5566bb369a75a86 --- include/linux/device.h | 1 - include/linux/dma-mapping.h | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/include/linux/device.h b/include/linux/device.h index 3c71b779668e..e19600c73fca 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -291,7 +291,6 @@ struct device_dma_parameters { * sg limitations. */ unsigned int max_segment_size; - unsigned int min_align_mask; unsigned long segment_boundary_mask; }; diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 7270f12e2c78..aab25a3c8e04 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -517,22 +517,6 @@ static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask) 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) { #ifdef ARCH_DMA_MINALIGN