From c67085fd2bd319c71a2b86e1026456082ffb8065 Mon Sep 17 00:00:00 2001
From: UtsavBalar1231 <utsavbalar1231@gmail.com>
Date: Mon, 22 Jun 2020 14:32:02 +0530
Subject: [PATCH] sm8150: fix gcc-10.1.0 warnings

Signed-off-by: UtsavBalar1231 <utsavbalar1231@gmail.com>
---
 drivers/nfc/nq-nci.c           | 2 +-
 drivers/of/base.c              | 4 ----
 drivers/platform/msm/usb_bam.c | 4 ++--
 init/do_mounts_dm.c            | 2 +-
 techpack/audio/dsp/q6voice.c   | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/nfc/nq-nci.c b/drivers/nfc/nq-nci.c
index d421daec5acc..003f2ae7729e 100644
--- a/drivers/nfc/nq-nci.c
+++ b/drivers/nfc/nq-nci.c
@@ -183,7 +183,7 @@ static irqreturn_t nqx_dev_irq_handler(int irq, void *dev_id)
 	return IRQ_HANDLED;
 }
 
-static int is_data_available_for_read(struct nqx_dev *nqx_dev)
+static __maybe_unused int is_data_available_for_read(struct nqx_dev *nqx_dev)
 {
 	int ret;
 
diff --git a/drivers/of/base.c b/drivers/of/base.c
index e5eeb4590c8b..91a6002a7fae 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -141,10 +141,6 @@ out:
 #ifndef CONFIG_MODULES
 static int __init of_free_phandle_cache(void)
 {
-	const char *name;
-	struct kobject *parent;
-	struct property *pp;
-	int rc;
 	unsigned long flags;
 
 	if (!of_kset)
diff --git a/drivers/platform/msm/usb_bam.c b/drivers/platform/msm/usb_bam.c
index a2ad63a6d448..d0079e39e84d 100644
--- a/drivers/platform/msm/usb_bam.c
+++ b/drivers/platform/msm/usb_bam.c
@@ -1190,7 +1190,7 @@ static int usb_bam_disconnect_ipa_prod(
 				__func__, pipe_connect->bam_type);
 		else
 			ctx->pipes_enabled_per_bam -= 1;
-			spin_unlock(&ctx->usb_bam_lock);
+		spin_unlock(&ctx->usb_bam_lock);
 	}
 
 	return 0;
@@ -1312,7 +1312,7 @@ retry:
 				 __func__, pipe_connect->bam_type);
 		else
 			ctx->pipes_enabled_per_bam -= 1;
-			spin_unlock(&ctx->usb_bam_lock);
+		spin_unlock(&ctx->usb_bam_lock);
 	}
 
 	pipe_connect->ipa_clnt_hdl = -1;
diff --git a/init/do_mounts_dm.c b/init/do_mounts_dm.c
index 8dc51dfc5805..2fc4f4c96539 100644
--- a/init/do_mounts_dm.c
+++ b/init/do_mounts_dm.c
@@ -309,7 +309,7 @@ error:
  * You can assume the first device is /dev/dm-0, the next device is /dev/dm-1,
  * and so forth.
  */
-static int __init dm_setup(char *str)
+static int __maybe_unused __init dm_setup(char *str)
 {
 	struct dm_option opt;
 	unsigned long num_devices;
diff --git a/techpack/audio/dsp/q6voice.c b/techpack/audio/dsp/q6voice.c
index bf51c888062b..a4da33cb6215 100644
--- a/techpack/audio/dsp/q6voice.c
+++ b/techpack/audio/dsp/q6voice.c
@@ -4292,7 +4292,7 @@ static int voice_send_cvp_mfc_config_cmd(struct voice_data *v)
 	return ret;
 }
 
-static int voice_get_avcs_version_per_service(uint32_t service_id)
+static __maybe_unused int voice_get_avcs_version_per_service(uint32_t service_id)
 {
 	int ret = 0;
 	size_t ver_size;