Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8778ac6b authored by Takashi Iwai's avatar Takashi Iwai Committed by Mark Brown
Browse files

ASoC: Fix build without CONFIG_GPIOLIB 



snd_soc_jack_gpio stuff is currently enabled for CONFIG_GPIOLIB
explicitly with ifdef, and this causes build errors on some drivers
such as:
  sound/soc/omap/rx51.c:220:33: error: array type has incomplete element type

Remove ifdef and provide dummy functions for CONFIG_GPIOLIB=n case
instead.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1

include/sound/soc.h

+11 −4
Original line number Diff line number Diff line
@@ -334,9 +334,7 @@ struct snd_soc_jack_pin; 
#include <sound/soc-dapm.h>

#include <sound/soc-dpcm.h>



#ifdef CONFIG_GPIOLIB

struct snd_soc_jack_gpio;

#endif



typedef int (*hw_write_t)(void *,const char* ,int);
@@ -446,6 +444,17 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count, 
			struct snd_soc_jack_gpio *gpios);

void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,

			struct snd_soc_jack_gpio *gpios);

#else

static inline int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,

					 struct snd_soc_jack_gpio *gpios)

{

	return 0;

}



static inline void snd_soc_jack_free_gpios(struct snd_soc_jack *jack, int count,

					   struct snd_soc_jack_gpio *gpios)

{

}

#endif



/* codec register bit access */
@@ -580,7 +589,6 @@ struct snd_soc_jack_zone { 
 *		       to provide more complex checks (eg, reading an

 *		       ADC).

 */

#ifdef CONFIG_GPIOLIB

struct snd_soc_jack_gpio {

	unsigned int gpio;

	const char *name;
@@ -594,7 +602,6 @@ struct snd_soc_jack_gpio { 


	int (*jack_status_check)(void);

};

#endif



struct snd_soc_jack {

	struct mutex mutex;