From 2f22f2ce4b1a2f4bb0d3a3ee854be113284f8d94 Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@google.com>
Date: Fri, 14 Aug 2020 12:05:10 -0700
Subject: [PATCH] Revert "ANDROID: ASoC: Fix 'allmodconfig' build break"

This reverts commit 972e02b5256aa6d40427413b2d2f19ed626156c3 because it
was a fix for commit 9cb7ec3e9be4 ("ANDROID: ASoC: core - add hostless
DAI support"), which got reverted by commit da171b5d560c ("ANDROID:
Revert "ANDROID: ASoC: core - add hostless DAI support"").  Therefore
it's no longer needed.

Bug: 144369166
Change-Id: If3ed9dcb04d9879d8fb4a74076c029cf8ce9a609
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
 arch/arc/mm/dma.c               | 1 -
 arch/arm/mm/dma-mapping-nommu.c | 1 -
 arch/arm/mm/dma-mapping.c       | 1 -
 arch/arm64/mm/dma-mapping.c     | 1 -
 arch/mips/mm/dma-noncoherent.c  | 1 -
 5 files changed, 5 deletions(-)

diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c
index c399f51d5237..e947572a521e 100644
--- a/arch/arc/mm/dma.c
+++ b/arch/arc/mm/dma.c
@@ -104,4 +104,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
 	dev_info(dev, "use %scoherent DMA ops\n",
 		 dev->dma_coherent ? "" : "non");
 }
-EXPORT_SYMBOL_GPL(arch_setup_dma_ops);
diff --git a/arch/arm/mm/dma-mapping-nommu.c b/arch/arm/mm/dma-mapping-nommu.c
index e862b053833f..287ef898a55e 100644
--- a/arch/arm/mm/dma-mapping-nommu.c
+++ b/arch/arm/mm/dma-mapping-nommu.c
@@ -209,4 +209,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
 	if (!dev->archdata.dma_coherent)
 		set_dma_ops(dev, &arm_nommu_dma_ops);
 }
-EXPORT_SYMBOL_GPL(arch_setup_dma_ops);
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index fdec6dd1b748..8a8949174b1c 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -2284,7 +2284,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
 #endif
 	dev->archdata.dma_ops_setup = true;
 }
-EXPORT_SYMBOL_GPL(arch_setup_dma_ops);
 
 void arch_teardown_dma_ops(struct device *dev)
 {
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index f06f8f98ffc2..6c45350e33aa 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -57,4 +57,3 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
 		dev->dma_ops = &xen_swiotlb_dma_ops;
 #endif
 }
-EXPORT_SYMBOL_GPL(arch_setup_dma_ops);
diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c
index 194fc7b4d423..563c2c0d0c81 100644
--- a/arch/mips/mm/dma-noncoherent.c
+++ b/arch/mips/mm/dma-noncoherent.c
@@ -137,5 +137,4 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size,
 {
 	dev->dma_coherent = coherent;
 }
-EXPORT_SYMBOL_GPL(arch_setup_dma_ops);
 #endif