greybus: audio: Build audio module conditionally

Added CONFIG_XXX flag check before compiling audio module.
Once we add dynamic DAI link registration from audio driver,
this check wil be required to avoid compilation failures with
other kernel revisions.

Also, renamed header file to better align with .c file name.

Signed-off-by: Vaibhav Agarwal <vaibhav.agarwal@linaro.org>
Signed-off-by: Mark Greer <mgreer@animalcreek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/Makefile b/drivers/staging/greybus/Makefile
index 4ebdc6b9c89f307e25f4182bd8a278be475db926..6759d684027ccc83048980038225cd4eb6d5e6ed 100644 (file)
--- a/drivers/staging/greybus/Makefile
+++ b/drivers/staging/greybus/Makefile
@@ -47,6 +47,9 @@ obj-m += gb-raw.o
 obj-m += gb-es2.o
 obj-m += gb-arche.o
 obj-m += gb-audio-codec.o
+ifeq ($(CONFIG_SND_SOC_DYNAMIC_DAILINK),y)
+ obj-m += gb-audio-codec.o
+endif
 obj-m += gb-camera.o
 obj-m += gb-audio-gb.o
 obj-m += gb-audio-apbridgea.o

diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c
index 2bc23095ffd0cb7a81647a28e6aa07aad1b5c5f4..826604ae64df5d105e049fea0ea1ac387464aa97 100644 (file)
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -7,7 +7,7 @@
  */
 #include <linux/module.h>
 
-#include "audio.h"
+#include "audio_codec.h"
 
 static int gbcodec_event_spk(struct snd_soc_dapm_widget *w,
                                        struct snd_kcontrol *k, int event)

diff --git a/drivers/staging/greybus/audio.h b/drivers/staging/greybus/audio_codec.h
similarity index 97%
rename from drivers/staging/greybus/audio.h
rename to drivers/staging/greybus/audio_codec.h
index fca60af3ddc1435aee1befc0ebf2b633686eab59..f8597b3de808843420f05cb770a6da657db1ebf5 100644 (file)
--- a/drivers/staging/greybus/audio.h
+++ b/drivers/staging/greybus/audio_codec.h
@@ -6,10 +6,8 @@
  * Released under the GPLv2 only.
  */
 
-#ifndef __LINUX_GBAUDIO_H
-#define __LINUX_GBAUDIO_H
-
-#ifdef __KERNEL__
+#ifndef __LINUX_GBAUDIO_CODEC_H
+#define __LINUX_GBAUDIO_CODEC_H
 
 #include <sound/soc.h>
 
@@ -145,5 +143,4 @@ extern int gb_audio_apbridgea_start_rx(struct gb_connection *connection,
 extern int gb_audio_apbridgea_stop_rx(struct gb_connection *connection,
                                      __u16 i2s_port);
 
-#endif /* __KERNEL__ */
-#endif /* __LINUX_GBAUDIO_H */
+#endif /* __LINUX_GBAUDIO_CODEC_H */