diff --git a/asoc/Makefile b/asoc/Makefile
index cc28148dcf3e..4d3839de9556 100644
--- a/asoc/Makefile
+++ b/asoc/Makefile
@@ -15,19 +15,9 @@ obj-$(CONFIG_SND_SOC_CPE) += snd-soc-cpe.o
 snd-soc-msm8998-objs := msm8998.o
 obj-$(CONFIG_SND_SOC_MACHINE_MSM8998) += snd-soc-msm8998.o
 
-# for SDM660 sound card driver
-snd-soc-sdm660-common-objs := sdm660-common.o
-obj-$(CONFIG_SND_SOC_SDM670) += snd-soc-sdm660-common.o
-
-# for SDM660 sound card driver
-snd-soc-int-codec-objs := sdm660-internal.o
-obj-$(CONFIG_SND_SOC_INT_CODEC) += snd-soc-sdm660-common.o
-obj-$(CONFIG_SND_SOC_INT_CODEC) += snd-soc-int-codec.o
-
-# for SDM660 sound card driver
-snd-soc-ext-codec-objs := sdm660-external.o sdm660-ext-dai-links.o
-obj-$(CONFIG_SND_SOC_EXT_CODEC) += snd-soc-sdm660-common.o
-obj-$(CONFIG_SND_SOC_EXT_CODEC) += snd-soc-ext-codec.o
+# for SDM670 sound card driver
+snd-soc-sdm670-objs := sdm660-common.o sdm660-internal.o sdm660-external.o sdm660-ext-dai-links.o
+obj-$(CONFIG_SND_SOC_SDM670) += snd-soc-sdm670.o
 
 # for SDM845 sound card driver
 snd-soc-sdm845-objs := sdm845.o
diff --git a/asoc/sdm660-external.h b/asoc/sdm660-external.h
index 0648c014b6d2..b81e158be5f7 100644
--- a/asoc/sdm660-external.h
+++ b/asoc/sdm660-external.h
@@ -32,7 +32,7 @@ int msm_ext_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
 			       struct snd_pcm_hw_params *params);
 int msm_snd_card_tavil_late_probe(struct snd_soc_card *card);
 int msm_snd_card_tasha_late_probe(struct snd_soc_card *card);
-#ifdef CONFIG_SND_SOC_EXT_CODEC
+#if IS_ENABLED(CONFIG_SND_SOC_EXT_CODEC)
 int msm_ext_cdc_init(struct platform_device *, struct msm_asoc_mach_data *,
 		     struct snd_soc_card **, struct wcd_mbhc_config *);
 void msm_ext_register_audio_notifier(struct platform_device *pdev);
diff --git a/asoc/sdm660-internal.h b/asoc/sdm660-internal.h
index ccc62b8f33dc..6918231b8b74 100644
--- a/asoc/sdm660-internal.h
+++ b/asoc/sdm660-internal.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -15,7 +15,7 @@
 
 #include <sound/soc.h>
 
-#ifdef CONFIG_SND_SOC_INT_CODEC
+#if IS_ENABLED(CONFIG_SND_SOC_INT_CODEC)
 int msm_int_cdc_init(struct platform_device *pdev,
 		     struct msm_asoc_mach_data *pdata,
 		     struct snd_soc_card **card,