Commit d3d5c905 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: arizona: Move notifier functions to header and make inline 



These functions are very thin wrappers around core functions, so they
make sense as inline functions.  Also making them inline avoids build
issues in the case where the machine driver is built in but the CODEC
is built as a module.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1095e281

sound/soc/codecs/arizona.c

+0 −24
Original line number Diff line number Diff line
@@ -2691,30 +2691,6 @@ int arizona_lhpf_coeff_put(struct snd_kcontrol *kcontrol, 
}

EXPORT_SYMBOL_GPL(arizona_lhpf_coeff_put);



int arizona_register_notifier(struct snd_soc_codec *codec,

			      struct notifier_block *nb,

			      int (*notify)(struct notifier_block *nb,

					    unsigned long action, void *data))

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;



	nb->notifier_call = notify;



	return blocking_notifier_chain_register(&arizona->notifier, nb);

}

EXPORT_SYMBOL_GPL(arizona_register_notifier);



int arizona_unregister_notifier(struct snd_soc_codec *codec,

				struct notifier_block *nb)

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;



	return blocking_notifier_chain_unregister(&arizona->notifier, nb);

}

EXPORT_SYMBOL_GPL(arizona_unregister_notifier);



MODULE_DESCRIPTION("ASoC Wolfson Arizona class device support");

MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");

MODULE_LICENSE("GPL");

sound/soc/codecs/arizona.h

+24 −8
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#define _ASOC_ARIZONA_H



#include <linux/completion.h>

#include <linux/notifier.h>

#include <linux/mfd/arizona/core.h>



#include <sound/soc.h>
@@ -66,7 +68,6 @@ 
/* Notifier events */

#define ARIZONA_NOTIFY_VOICE_TRIGGER   0x1



struct arizona;

struct wm_adsp;



struct arizona_dai_priv {
@@ -329,12 +330,27 @@ extern bool arizona_input_analog(struct snd_soc_codec *codec, int shift); 


extern const char *arizona_sample_rate_val_to_name(unsigned int rate_val);



extern int arizona_register_notifier(struct snd_soc_codec *codec,

static inline int arizona_register_notifier(struct snd_soc_codec *codec,

					    struct notifier_block *nb,

				     int (*notify)(struct notifier_block *nb,

						   unsigned long action,

						   void *data));

extern int arizona_unregister_notifier(struct snd_soc_codec *codec,

				       struct notifier_block *nb);

					    int (*notify)

					    (struct notifier_block *nb,

					    unsigned long action, void *data))

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;



	nb->notifier_call = notify;



	return blocking_notifier_chain_register(&arizona->notifier, nb);

}



static inline int arizona_unregister_notifier(struct snd_soc_codec *codec,

					      struct notifier_block *nb)

{

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;



	return blocking_notifier_chain_unregister(&arizona->notifier, nb);

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE