From 11b2aeb0c955aebd3ff32e6d326036f25aa418c3 Mon Sep 17 00:00:00 2001
From: Junkai Cai <junkai@codeaurora.org>
Date: Thu, 28 Oct 2021 16:47:53 -0700
Subject: [PATCH] asoc: update asoc and ipc drivers for kernel 5.15

Port drivers for Linux kernel 5.15(or after).

Remove unused headers that not present in the new kernel.
Update function interface matching API updates in the kernel.

Change-Id: Ibdffbe20c0b65b2ddda958d6a32c493696e15768
Signed-off-by: Junkai Cai <junkai@codeaurora.org>
---
 asoc/codecs/wcd9xxx-soc-init.c | 17 ++++-------------
 include/ipc/apr.h              |  3 +--
 ipc/gpr-lite.c                 |  4 ++--
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/asoc/codecs/wcd9xxx-soc-init.c b/asoc/codecs/wcd9xxx-soc-init.c
index 06a991ca99..b9c4486148 100644
--- a/asoc/codecs/wcd9xxx-soc-init.c
+++ b/asoc/codecs/wcd9xxx-soc-init.c
@@ -1,26 +1,18 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017, 2021 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
-#include <sound/wcd-dsp-mgr.h>
 #include "audio-ext-clk-up.h"
 
 static int __init wcd9xxx_soc_init(void)
 {
 	int ret = 0;
 
-	ret = wcd_dsp_mgr_init();
-	if (!ret) {
-		ret = audio_ref_clk_platform_init();
-		if (ret) {
-			pr_err("%s: init extclk fail: %d\n", __func__, ret);
-			wcd_dsp_mgr_exit();
-		}
-	} else {
-		pr_err("%s: init dsp mgr fail: %d\n", __func__, ret);
-	}
+	ret = audio_ref_clk_platform_init();
+	if (ret)
+		pr_err("%s: init extclk fail: %d\n", __func__, ret);
 
 	return ret;
 }
@@ -29,7 +21,6 @@ module_init(wcd9xxx_soc_init);
 static void __exit wcd9xxx_soc_exit(void)
 {
 	audio_ref_clk_platform_exit();
-	wcd_dsp_mgr_exit();
 }
 module_exit(wcd9xxx_soc_exit);
 
diff --git a/include/ipc/apr.h b/include/ipc/apr.h
index 40fc92c7d8..f39ca1a063 100644
--- a/include/ipc/apr.h
+++ b/include/ipc/apr.h
@@ -1,12 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2010-2017, 2019, 2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2017, 2019-2021, The Linux Foundation. All rights reserved.
  */
 #ifndef __APR_H_
 #define __APR_H_
 
 #include <linux/mutex.h>
-#include <soc/qcom/subsystem_notif.h>
 
 enum apr_subsys_state {
 	APR_SUBSYS_DOWN,
diff --git a/ipc/gpr-lite.c b/ipc/gpr-lite.c
index 8ccda9a597..d8d81a3c7f 100644
--- a/ipc/gpr-lite.c
+++ b/ipc/gpr-lite.c
@@ -355,7 +355,7 @@ static int gpr_device_probe(struct device *dev)
 	return adrv->probe(adev);
 }
 
-static int gpr_device_remove(struct device *dev)
+static void gpr_device_remove(struct device *dev)
 {
 	struct gpr_device *adev = to_gpr_device(dev);
 	struct gpr_driver *adrv;
@@ -370,7 +370,7 @@ static int gpr_device_remove(struct device *dev)
 		spin_unlock(&gpr->svcs_lock);
 	}
 
-	return 0;
+	return;
 }
 
 static int gpr_uevent(struct device *dev, struct kobj_uevent_env *env)