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

ASoC: soc-dapm.h: cleanup white space 



soc-dapm.h defines many things, but it is using
randam white space and tag.
This patch do nothing, but cleanup its white space.
This patch cleanup also 100 char in 1 line.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/87y1tcsl6u.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-dapm.h

+71 −102
Original line number Diff line number Diff line
@@ -353,16 +353,12 @@ struct soc_enum; 
#define SND_SOC_DAPM_POST_REG		0x20	/* after  audio path setup */

#define SND_SOC_DAPM_WILL_PMU		0x40	/* called at start of sequence */

#define SND_SOC_DAPM_WILL_PMD		0x80	/* called at start of sequence */

#define SND_SOC_DAPM_PRE_POST_PMD \

				(SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD)

#define SND_SOC_DAPM_PRE_POST_PMU \

				(SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU)

#define SND_SOC_DAPM_PRE_POST_PMD	(SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD)

#define SND_SOC_DAPM_PRE_POST_PMU	(SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU)



/* convenience event type detection */

#define SND_SOC_DAPM_EVENT_ON(e)	\

	(e & (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU))

#define SND_SOC_DAPM_EVENT_OFF(e)	\

	(e & (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD))

#define SND_SOC_DAPM_EVENT_ON(e)	(e & (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU))

#define SND_SOC_DAPM_EVENT_OFF(e)	(e & (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD))



/* regulator widget flags */

#define SND_SOC_DAPM_REGULATOR_BYPASS	0x1	/* bypass when disabled */
@@ -396,18 +392,13 @@ 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);

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_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,
@@ -419,30 +410,24 @@ int snd_soc_dapm_get_pin_switch(struct snd_kcontrol *kcontrol, 
int snd_soc_dapm_put_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,

	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, 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,

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);

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);

			    struct snd_pcm_hw_params *params, struct snd_soc_dai *dai);



/* 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);

		       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,
@@ -452,46 +437,34 @@ int snd_soc_dapm_weak_routes(struct snd_soc_dapm_context *dapm, 
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_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);

		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);

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_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_nc_pin(struct snd_soc_dapm_context *dapm, const char *pin);

int snd_soc_dapm_nc_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_nc_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);

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);



/* Mostly internal - should not normally be used */
@@ -500,18 +473,13 @@ void dapm_mark_endpoints_dirty(struct snd_soc_card *card); 
/* 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));

	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_context *snd_soc_dapm_kcontrol_dapm(struct snd_kcontrol *kcontrol);

struct snd_soc_dapm_widget *snd_soc_dapm_kcontrol_widget(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);

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 {
@@ -682,9 +650,10 @@ struct snd_soc_dapm_update { 
/* DAPM context */

struct snd_soc_dapm_context {

	enum snd_soc_bias_level bias_level;



	/* bit field */

	unsigned int idle_bias_off:1;		/* Use BIAS_OFF instead of STANDBY */

	/* Go to BIAS_OFF in suspend if the DAPM context is idle */

	unsigned int suspend_bias_off:1;

	unsigned int suspend_bias_off:1;	/* Use BIAS_OFF in suspend if the DAPM is idle */



	struct device *dev;			/* from parent - for debug */

	struct snd_soc_component *component;	/* parent component */