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

Unverified Commit 2c7b696a authored by Marcel Ziswiler's avatar Marcel Ziswiler Committed by Mark Brown
Browse files

ASoC: soc-core: fix trivial checkpatch issues 



Fix a few trivial aka cosmetic only checkpatch issues like long lines,
wrong indentations, spurious blanks and newlines, missing newlines,
multi-line comments etc.

Signed-off-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 3c01b0e1

sound/soc/soc-core.c

+88 −58
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ static int pmdown_time = 5000; 
module_param(pmdown_time, int, 0);

MODULE_PARM_DESC(pmdown_time, "DAPM stream powerdown time (msecs)");



/* If a DMI filed contain strings in this blacklist (e.g.

/*

 * If a DMI filed contain strings in this blacklist (e.g.

 * "Type2 - Board Manufacturer" or "Type1 - TBD by OEM"), it will be taken

 * as invalid and dropped when setting the card long name from DMI info.

 */
@@ -426,7 +427,8 @@ EXPORT_SYMBOL_GPL(snd_soc_get_pcm_runtime); 


static void codec2codec_close_delayed_work(struct work_struct *work)

{

	/* Currently nothing to do for c2c links

	/*

	 * Currently nothing to do for c2c links

	 * Since c2c links are internal nodes in the DAPM graph and

	 * don't interface with the outside world or application layer

	 * we don't have to do any special handling on close.
@@ -446,7 +448,8 @@ int snd_soc_suspend(struct device *dev) 
	if (!card->instantiated)

		return 0;



	/* Due to the resume being scheduled into a workqueue we could

	/*

	 * Due to the resume being scheduled into a workqueue we could

	 * suspend before that's finished - wait for it to complete.

	 */

	snd_power_wait(card->snd_card, SNDRV_CTL_POWER_D0);
@@ -514,10 +517,13 @@ int snd_soc_suspend(struct device *dev) 


	/* suspend all COMPONENTs */

	for_each_card_components(card, component) {

		struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

		struct snd_soc_dapm_context *dapm =

				snd_soc_component_get_dapm(component);



		/* If there are paths active then the COMPONENT will be held with

		 * bias _ON and should not be suspended. */

		/*

		 * If there are paths active then the COMPONENT will be held

		 * with bias _ON and should not be suspended.

		 */

		if (!component->suspended) {

			switch (snd_soc_dapm_get_bias_level(dapm)) {

			case SND_SOC_BIAS_STANDBY:
@@ -571,18 +577,21 @@ int snd_soc_suspend(struct device *dev) 
}

EXPORT_SYMBOL_GPL(snd_soc_suspend);



/* deferred resume work, so resume can complete before we finished

/*

 * deferred resume work, so resume can complete before we finished

 * setting our codec back up, which can be very slow on I2C

 */

static void soc_resume_deferred(struct work_struct *work)

{

	struct snd_soc_card *card =

			container_of(work, struct snd_soc_card, deferred_resume_work);

			container_of(work, struct snd_soc_card,

				     deferred_resume_work);

	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_component *component;

	int i;



	/* our power state is still SNDRV_CTL_POWER_D3hot from suspend time,

	/*

	 * our power state is still SNDRV_CTL_POWER_D3hot from suspend time,

	 * so userspace apps are blocked from touching us

	 */
@@ -699,6 +708,7 @@ int snd_soc_resume(struct device *dev) 
	 */

	for_each_card_rtds(card, rtd) {

		struct snd_soc_dai *cpu_dai = rtd->cpu_dai;



		bus_control |= cpu_dai->driver->bus_control;

	}

	if (bus_control) {
@@ -795,7 +805,6 @@ struct snd_soc_dai *snd_soc_find_dai( 
}

EXPORT_SYMBOL_GPL(snd_soc_find_dai);





/**

 * snd_soc_find_dai_link - Find a DAI link

 *
@@ -1148,7 +1157,8 @@ static int soc_init_dai_link(struct snd_soc_card *card, 


void snd_soc_disconnect_sync(struct device *dev)

{

	struct snd_soc_component *component = snd_soc_lookup_component(dev, NULL);

	struct snd_soc_component *component =

			snd_soc_lookup_component(dev, NULL);



	if (!component || !component->card)

		return;
@@ -1179,7 +1189,8 @@ int snd_soc_add_dai_link(struct snd_soc_card *card, 
	}



	lockdep_assert_held(&client_mutex);

	/* Notify the machine driver for extra initialization

	/*

	 * Notify the machine driver for extra initialization

	 * on the link created by topology.

	 */

	if (dai_link->dobj.type && card->add_dai_link)
@@ -1214,7 +1225,8 @@ void snd_soc_remove_dai_link(struct snd_soc_card *card, 
	}



	lockdep_assert_held(&client_mutex);

	/* Notify the machine driver for extra destruction

	/*

	 * Notify the machine driver for extra destruction

	 * on the link created by topology.

	 */

	if (dai_link->dobj.type && card->remove_dai_link)
@@ -1274,7 +1286,8 @@ static void soc_set_name_prefix(struct snd_soc_card *card, 
static int soc_probe_component(struct snd_soc_card *card,

	struct snd_soc_component *component)

{

	struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);

	struct snd_soc_dapm_context *dapm =

			snd_soc_component_get_dapm(component);

	struct snd_soc_dai *dai;

	int ret;
@@ -1406,8 +1419,7 @@ static int soc_post_component_init(struct snd_soc_pcm_runtime *rtd, 
}



static int soc_probe_link_components(struct snd_soc_card *card,

			struct snd_soc_pcm_runtime *rtd,

				     int order)

				     struct snd_soc_pcm_runtime *rtd, int order)

{

	struct snd_soc_component *component;

	struct snd_soc_rtdcom_list *rtdcom;
@@ -1434,6 +1446,7 @@ static int soc_probe_dai(struct snd_soc_dai *dai, int order) 


	if (dai->driver->probe) {

		int ret = dai->driver->probe(dai);



		if (ret < 0) {

			dev_err(dai->dev, "ASoC: failed to probe DAI %s: %d\n",

				dai->name, ret);
@@ -1683,8 +1696,10 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, 
		}

	}



	/* Flip the polarity for the "CPU" end of a CODEC<->CODEC link */

	/* the component which has non_legacy_dai_naming is Codec */

	/*

	 * Flip the polarity for the "CPU" end of a CODEC<->CODEC link

	 * the component which has non_legacy_dai_naming is Codec

	 */

	if (cpu_dai->component->driver->non_legacy_dai_naming) {

		unsigned int inv_dai_fmt;
@@ -1718,9 +1733,9 @@ int snd_soc_runtime_set_dai_fmt(struct snd_soc_pcm_runtime *rtd, 
}

EXPORT_SYMBOL_GPL(snd_soc_runtime_set_dai_fmt);





#ifdef CONFIG_DMI

/* Trim special characters, and replace '-' with '_' since '-' is used to

/*

 * Trim special characters, and replace '-' with '_' since '-' is used to

 * separate different DMI fields in the card long name. Only number and

 * alphabet characters and a few separator characters are kept.

 */
@@ -1739,7 +1754,8 @@ static void cleanup_dmi_name(char *name) 
	name[j] = '\0';

}



/* Check if a DMI field is valid, i.e. not containing any string

/*

 * Check if a DMI field is valid, i.e. not containing any string

 * in the black list.

 */

static int is_dmi_valid(const char *field)
@@ -1802,7 +1818,6 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) 
		return 0;

	}





	snprintf(card->dmi_longname, sizeof(card->snd_card->longname),

			 "%s", vendor);

	cleanup_dmi_name(card->dmi_longname);
@@ -1818,7 +1833,8 @@ int snd_soc_set_dmi_name(struct snd_soc_card *card, const char *flavour) 
		if (len < longname_buf_size)

			cleanup_dmi_name(card->dmi_longname + len);



		/* some vendors like Lenovo may only put a self-explanatory

		/*

		 * some vendors like Lenovo may only put a self-explanatory

		 * name in the product version field

		 */

		product_version = dmi_get_system_info(DMI_PRODUCT_VERSION);
@@ -1914,7 +1930,8 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) 
			dai_link->be_hw_params_fixup =

				component->driver->be_hw_params_fixup;



			/* most BE links don't set stream name, so set it to

			/*

			 * most BE links don't set stream name, so set it to

			 * dai link name if it's NULL to help bind widgets.

			 */

			if (!dai_link->stream_name)
@@ -2029,7 +2046,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) 
	if (ret < 0)

		goto probe_dai_err;



	/* Find new DAI links added during probing components and bind them.

	/*

	 * Find new DAI links added during probing components and bind them.

	 * Components with topology may bring new DAIs and DAI links.

	 */

	for_each_card_links(card, dai_link) {
@@ -2061,7 +2079,8 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) 
	snd_soc_dapm_connect_dai_link_widgets(card);



	if (card->controls)

		snd_soc_add_card_controls(card, card->controls, card->num_controls);

		snd_soc_add_card_controls(card, card->controls,

					  card->num_controls);



	if (card->dapm_routes)

		snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes,
@@ -2207,8 +2226,10 @@ int snd_soc_poweroff(struct device *dev) 
	if (!card->instantiated)

		return 0;



	/* Flush out pmdown_time work - we actually do want to run it

	 * now, we're shutting down so no imminent restart. */

	/*

	 * Flush out pmdown_time work - we actually do want to run it

	 * now, we're shutting down so no imminent restart.

	 */

	for_each_card_rtds(card, rtd)

		flush_delayed_work(&rtd->delayed_work);
@@ -2301,6 +2322,7 @@ static int snd_soc_add_controls(struct snd_card *card, struct device *dev, 


	for (i = 0; i < num_controls; i++) {

		const struct snd_kcontrol_new *control = &controls[i];



		err = snd_ctl_add(card, snd_soc_cnew(control, data,

						     control->name, prefix));

		if (err < 0) {
@@ -2418,8 +2440,9 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_set_sysclk); 
 *

 * Configures the CODEC master (MCLK) or system (SYSCLK) clocking.

 */

int snd_soc_component_set_sysclk(struct snd_soc_component *component, int clk_id,

			     int source, unsigned int freq, int dir)

int snd_soc_component_set_sysclk(struct snd_soc_component *component,

				 int clk_id, int source, unsigned int freq,

				 int dir)

{

	if (component->driver->set_sysclk)

		return component->driver->set_sysclk(component, clk_id, source,
@@ -2807,7 +2830,8 @@ static char *fmt_single_name(struct device *dev, int *id) 
			*id = ((id1 & 0xffff) << 16) + id2;



			/* sanitize component name for DAI link creation */

			snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name, name);

			snprintf(tmp, NAME_SIZE, "%s.%s", dev->driver->name,

				 name);

			strlcpy(name, tmp, NAME_SIZE);

		} else

			*id = 0;
@@ -2910,7 +2934,8 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component, 
 * @count: Number of DAIs

 */

static int snd_soc_register_dais(struct snd_soc_component *component,

				 struct snd_soc_dai_driver *dai_drv, size_t count)

				 struct snd_soc_dai_driver *dai_drv,

				 size_t count)

{

	struct device *dev = component->dev;

	struct snd_soc_dai *dai;
@@ -2921,8 +2946,8 @@ static int snd_soc_register_dais(struct snd_soc_component *component, 


	for (i = 0; i < count; i++) {



		dai = soc_add_dai(component, dai_drv + i,

				  count == 1 && !component->driver->non_legacy_dai_naming);

		dai = soc_add_dai(component, dai_drv + i, count == 1 &&

				  !component->driver->non_legacy_dai_naming);

		if (dai == NULL) {

			ret = -ENOMEM;

			goto err;
@@ -2966,7 +2991,8 @@ int snd_soc_register_dai(struct snd_soc_component *component, 
	if (!dai)

		return -ENOMEM;



	/* Create the DAI widgets here. After adding DAIs, topology may

	/*

	 * Create the DAI widgets here. After adding DAIs, topology may

	 * also add routes that need these widgets as source or sink.

	 */

	ret = snd_soc_dapm_new_dai_widgets(dapm, dai);
@@ -3048,7 +3074,8 @@ static void snd_soc_component_setup_regmap(struct snd_soc_component *component) 
#ifdef CONFIG_REGMAP



/**

 * snd_soc_component_init_regmap() - Initialize regmap instance for the component

 * snd_soc_component_init_regmap() - Initialize regmap instance for the

 *                                   component

 * @component: The component for which to initialize the regmap instance

 * @regmap: The regmap instance that should be used by the component

 *
@@ -3066,7 +3093,8 @@ void snd_soc_component_init_regmap(struct snd_soc_component *component, 
EXPORT_SYMBOL_GPL(snd_soc_component_init_regmap);



/**

 * snd_soc_component_exit_regmap() - De-initialize regmap instance for the component

 * snd_soc_component_exit_regmap() - De-initialize regmap instance for the

 *                                   component

 * @component: The component for which to de-initialize the regmap instance

 *

 * Calls regmap_exit() on the regmap instance associated to the component and
@@ -3090,7 +3118,8 @@ static void snd_soc_component_add(struct snd_soc_component *component) 


	if (!component->driver->write && !component->driver->read) {

		if (!component->regmap)

			component->regmap = dev_get_regmap(component->dev, NULL);

			component->regmap = dev_get_regmap(component->dev,

							   NULL);

		if (component->regmap)

			snd_soc_component_setup_regmap(component);

	}
@@ -3235,23 +3264,24 @@ static int __snd_soc_unregister_component(struct device *dev) 
		if (dev != component->dev)

			continue;



		snd_soc_tplg_component_remove(component, SND_SOC_TPLG_INDEX_ALL);

		snd_soc_tplg_component_remove(component,

					      SND_SOC_TPLG_INDEX_ALL);

		snd_soc_component_del_unlocked(component);

		found = 1;

		break;

	}

	mutex_unlock(&client_mutex);



	if (found) {

	if (found)

		snd_soc_component_cleanup(component);

	}



	return found;

}



void snd_soc_unregister_component(struct device *dev)

{

	while (__snd_soc_unregister_component(dev));

	while (__snd_soc_unregister_component(dev))

		;

}

EXPORT_SYMBOL_GPL(snd_soc_unregister_component);