Unverified Commit f02ccc8c authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-dapm: reordering header definitions 



Because header defined randomly, it needs name definitions on top of
soc-dapm.h. it is not needed if definitions are implemented in correct
order.

This patch has big change from change-line point of view, but is
just reordering, nothing changed in meaning.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87plekhit0.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0d516af9

include/sound/soc-dapm.h

+110 −125
Original line number Diff line number Diff line
@@ -16,9 +16,10 @@ 
#include <sound/asoc.h>



struct device;

struct regulator;

struct soc_enum;

struct snd_pcm_substream;

struct snd_soc_pcm_runtime;

struct soc_enum;



/* widget has no PM register bit */

#define SND_SOC_NOPM	-1
@@ -399,17 +400,6 @@ struct soc_enum; 
/* regulator widget flags */

#define SND_SOC_DAPM_REGULATOR_BYPASS	0x1	/* bypass when disabled */



struct snd_soc_dapm_widget;

enum snd_soc_dapm_type;

struct snd_soc_dapm_path;

struct snd_soc_dapm_pin;

struct snd_soc_dapm_route;

struct snd_soc_dapm_context;

struct regulator;

struct snd_soc_dapm_widget_list;

struct snd_soc_dapm_update;

enum snd_soc_dapm_direction;



/*

 * Bias levels

 *
@@ -428,104 +418,6 @@ enum snd_soc_bias_level { 
	SND_SOC_BIAS_ON = 3,

};



int dapm_regulator_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event);

int dapm_clock_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event);

int dapm_pinctrl_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event);



/* dapm controls */

int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_info_pin_switch(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_info *uinfo);

int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *uncontrol);

int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,

	struct snd_ctl_elem_value *uncontrol);

int snd_soc_dapm_get_component_pin_switch(struct snd_kcontrol *kcontrol,

					  struct snd_ctl_elem_value *uncontrol);

int snd_soc_dapm_put_component_pin_switch(struct snd_kcontrol *kcontrol,

					  struct snd_ctl_elem_value *uncontrol);

int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,

	const struct snd_soc_dapm_widget *widget, unsigned int num);

struct snd_soc_dapm_widget *snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,

		const struct snd_soc_dapm_widget *widget);

struct snd_soc_dapm_widget *snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,

		const struct snd_soc_dapm_widget *widget);

int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, struct snd_soc_dai *dai);

void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w);

int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);

void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);



int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream,

			    struct snd_pcm_hw_params *params, struct snd_soc_dai *dai);

int snd_soc_dapm_widget_name_cmp(struct snd_soc_dapm_widget *widget, const char *s);



/* dapm path setup */

int snd_soc_dapm_new_widgets(struct snd_soc_card *card);

void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm);

void snd_soc_dapm_init(struct snd_soc_dapm_context *dapm,

		       struct snd_soc_card *card, struct snd_soc_component *component);

int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,

			    const struct snd_soc_dapm_route *route, int num);

int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm,

			    const struct snd_soc_dapm_route *route, int num);

void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w);



/* dapm events */

void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, int event);

void snd_soc_dapm_stream_stop(struct snd_soc_pcm_runtime *rtd, int stream);

void snd_soc_dapm_shutdown(struct snd_soc_card *card);



/* external DAPM widget events */

int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm,

		struct snd_kcontrol *kcontrol, int connect, struct snd_soc_dapm_update *update);

int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm,

		struct snd_kcontrol *kcontrol, int mux, struct soc_enum *e,

		struct snd_soc_dapm_update *update);



/* dapm sys fs - used by the core */

extern struct attribute *soc_dapm_dev_attrs[];

void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, struct dentry *parent);



/* dapm audio pin control and status */

int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_disable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, const char *pin);

unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol);

void dapm_mark_endpoints_dirty(struct snd_soc_card *card);



/*

 * Marks the specified pin as being not connected, disabling it along

 * any parent or child widgets.  At present this is identical to

 * snd_soc_dapm_disable_pin[_unlocked]() but in future it will be extended to do

 * additional things such as disabling controls which only affect

 * paths through the pin.

 */

#define snd_soc_dapm_nc_pin		snd_soc_dapm_disable_pin

#define snd_soc_dapm_nc_pin_unlocked	snd_soc_dapm_disable_pin_unlocked



/* dapm path query */

int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,

	struct snd_soc_dapm_widget_list **list,

	bool (*custom_stop_condition)(struct snd_soc_dapm_widget *, enum snd_soc_dapm_direction));

void snd_soc_dapm_dai_free_widgets(struct snd_soc_dapm_widget_list **list);



struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(struct snd_kcontrol *kcontrol);

struct snd_soc_dapm_widget *snd_soc_dapm_kcontrol_widget(struct snd_kcontrol *kcontrol);



int snd_soc_dapm_force_bias_level(struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level);



/* dapm widget types */

enum snd_soc_dapm_type {

	snd_soc_dapm_input = 0,		/* input pin */
@@ -717,11 +609,6 @@ struct snd_soc_dapm_widget_list { 
	struct snd_soc_dapm_widget *widgets[] __counted_by(num_widgets);

};



#define for_each_dapm_widgets(list, i, widget)				\

	for ((i) = 0;							\

	     (i) < list->num_widgets && (widget = list->widgets[i]);	\

	     (i)++)



struct snd_soc_dapm_stats {

	int power_checks;

	int path_checks;
@@ -733,6 +620,114 @@ struct snd_soc_dapm_pinctrl_priv { 
	const char *sleep_state;

};



enum snd_soc_dapm_direction {

	SND_SOC_DAPM_DIR_IN,

	SND_SOC_DAPM_DIR_OUT

};



#define SND_SOC_DAPM_DIR_TO_EP(x) BIT(x)



#define SND_SOC_DAPM_EP_SOURCE	SND_SOC_DAPM_DIR_TO_EP(SND_SOC_DAPM_DIR_IN)

#define SND_SOC_DAPM_EP_SINK	SND_SOC_DAPM_DIR_TO_EP(SND_SOC_DAPM_DIR_OUT)



int dapm_regulator_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event);

int dapm_clock_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event);

int dapm_pinctrl_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event);



/* dapm controls */

int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_get_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol);

int snd_soc_dapm_info_pin_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo);

int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *uncontrol);

int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *uncontrol);

int snd_soc_dapm_get_component_pin_switch(struct snd_kcontrol *kcontrol,

					  struct snd_ctl_elem_value *uncontrol);

int snd_soc_dapm_put_component_pin_switch(struct snd_kcontrol *kcontrol,

					  struct snd_ctl_elem_value *uncontrol);

int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm,

	const struct snd_soc_dapm_widget *widget, unsigned int num);

struct snd_soc_dapm_widget *snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,

		const struct snd_soc_dapm_widget *widget);

struct snd_soc_dapm_widget *snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm,

		const struct snd_soc_dapm_widget *widget);

int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, struct snd_soc_dai *dai);

void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w);

int snd_soc_dapm_link_dai_widgets(struct snd_soc_card *card);

void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card);



int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream,

			    struct snd_pcm_hw_params *params, struct snd_soc_dai *dai);

int snd_soc_dapm_widget_name_cmp(struct snd_soc_dapm_widget *widget, const char *s);



/* dapm path setup */

int snd_soc_dapm_new_widgets(struct snd_soc_card *card);

void snd_soc_dapm_free(struct snd_soc_dapm_context *dapm);

void snd_soc_dapm_init(struct snd_soc_dapm_context *dapm,

		       struct snd_soc_card *card, struct snd_soc_component *component);

int snd_soc_dapm_add_routes(struct snd_soc_dapm_context *dapm,

			    const struct snd_soc_dapm_route *route, int num);

int snd_soc_dapm_del_routes(struct snd_soc_dapm_context *dapm,

			    const struct snd_soc_dapm_route *route, int num);

void snd_soc_dapm_free_widget(struct snd_soc_dapm_widget *w);



/* dapm events */

void snd_soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, int event);

void snd_soc_dapm_stream_stop(struct snd_soc_pcm_runtime *rtd, int stream);

void snd_soc_dapm_shutdown(struct snd_soc_card *card);



/* external DAPM widget events */

int snd_soc_dapm_mixer_update_power(struct snd_soc_dapm_context *dapm,

		struct snd_kcontrol *kcontrol, int connect, struct snd_soc_dapm_update *update);

int snd_soc_dapm_mux_update_power(struct snd_soc_dapm_context *dapm,

		struct snd_kcontrol *kcontrol, int mux, struct soc_enum *e,

		struct snd_soc_dapm_update *update);



/* dapm sys fs - used by the core */

extern struct attribute *soc_dapm_dev_attrs[];

void snd_soc_dapm_debugfs_init(struct snd_soc_dapm_context *dapm, struct dentry *parent);



/* dapm audio pin control and status */

int snd_soc_dapm_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_disable_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_disable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_get_pin_status(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_sync(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_sync_unlocked(struct snd_soc_dapm_context *dapm);

int snd_soc_dapm_force_enable_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_ignore_suspend(struct snd_soc_dapm_context *dapm, const char *pin);

unsigned int dapm_kcontrol_get_value(const struct snd_kcontrol *kcontrol);

void dapm_mark_endpoints_dirty(struct snd_soc_card *card);



/*

 * Marks the specified pin as being not connected, disabling it along

 * any parent or child widgets.  At present this is identical to

 * snd_soc_dapm_disable_pin[_unlocked]() but in future it will be extended to do

 * additional things such as disabling controls which only affect

 * paths through the pin.

 */

#define snd_soc_dapm_nc_pin		snd_soc_dapm_disable_pin

#define snd_soc_dapm_nc_pin_unlocked	snd_soc_dapm_disable_pin_unlocked



/* dapm path query */

int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,

	struct snd_soc_dapm_widget_list **list,

	bool (*custom_stop_condition)(struct snd_soc_dapm_widget *, enum snd_soc_dapm_direction));

void snd_soc_dapm_dai_free_widgets(struct snd_soc_dapm_widget_list **list);



struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(struct snd_kcontrol *kcontrol);

struct snd_soc_dapm_widget *snd_soc_dapm_kcontrol_widget(struct snd_kcontrol *kcontrol);



int snd_soc_dapm_force_bias_level(struct snd_soc_dapm_context *dapm, enum snd_soc_bias_level level);



#define for_each_dapm_widgets(list, i, widget)				\

	for ((i) = 0;							\

	     (i) < list->num_widgets && (widget = list->widgets[i]);	\

	     (i)++)



/**

 * snd_soc_dapm_init_bias_level() - Initialize DAPM bias level

 * @dapm: The DAPM context to initialize
@@ -764,16 +759,6 @@ static inline enum snd_soc_bias_level snd_soc_dapm_get_bias_level( 
	return dapm->bias_level;

}



enum snd_soc_dapm_direction {

	SND_SOC_DAPM_DIR_IN,

	SND_SOC_DAPM_DIR_OUT

};



#define SND_SOC_DAPM_DIR_TO_EP(x) BIT(x)



#define SND_SOC_DAPM_EP_SOURCE	SND_SOC_DAPM_DIR_TO_EP(SND_SOC_DAPM_DIR_IN)

#define SND_SOC_DAPM_EP_SINK	SND_SOC_DAPM_DIR_TO_EP(SND_SOC_DAPM_DIR_OUT)



/**

 * snd_soc_dapm_widget_for_each_path - Iterates over all paths in the

 *   specified direction of a widget