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

ASoC: soc-component: add snd_soc_component_get/put() 



ALSA SoC is calling try_module_get()/module_put() based on
component->driver->module_get_upon_open.
To keep simple and readable code, we should create its function.
This patch adds new snd_soc_component_get/put().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87h8795ro4.wl-kuninori.morimoto.gx@renesas.com


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

include/sound/soc-component.h

+13 −0
Original line number Diff line number Diff line
@@ -287,6 +287,19 @@ void snd_soc_component_init_regmap(struct snd_soc_component *component, 
void snd_soc_component_exit_regmap(struct snd_soc_component *component);

#endif



#define snd_soc_component_module_get_when_probe(component)\

	snd_soc_component_module_get(component, 0)

#define snd_soc_component_module_get_when_open(component)	\

	snd_soc_component_module_get(component, 1)

int snd_soc_component_module_get(struct snd_soc_component *component,

				 int upon_open);

#define snd_soc_component_module_put_when_remove(component)	\

	snd_soc_component_module_put(component, 0)

#define snd_soc_component_module_put_when_close(component)	\

	snd_soc_component_module_put(component, 1)

void snd_soc_component_module_put(struct snd_soc_component *component,

				  int upon_open);



static inline void snd_soc_component_set_drvdata(struct snd_soc_component *c,

						 void *data)

{

sound/soc/soc-component.c

+18 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
// Copyright (C) 2019 Renesas Electronics Corp.

// Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

//

#include <linux/module.h>

#include <sound/soc.h>



/**
@@ -267,3 +268,20 @@ int snd_soc_component_set_jack(struct snd_soc_component *component, 
	return -ENOTSUPP;

}

EXPORT_SYMBOL_GPL(snd_soc_component_set_jack);



int snd_soc_component_module_get(struct snd_soc_component *component,

				 int upon_open)

{

	if (component->driver->module_get_upon_open == !!upon_open &&

	    !try_module_get(component->dev->driver->owner))

		return -ENODEV;



	return 0;

}



void snd_soc_component_module_put(struct snd_soc_component *component,

				  int upon_open)

{

	if (component->driver->module_get_upon_open == !!upon_open)

		module_put(component->dev->driver->owner);

}

sound/soc/soc-core.c

+4 −5
Original line number Diff line number Diff line
@@ -926,8 +926,7 @@ static void soc_cleanup_component(struct snd_soc_component *component) 
	snd_soc_dapm_free(snd_soc_component_get_dapm(component));

	soc_cleanup_component_debugfs(component);

	component->card = NULL;

	if (!component->driver->module_get_upon_open)

		module_put(component->dev->driver->owner);

	snd_soc_component_module_put_when_close(component);

}



static void soc_remove_component(struct snd_soc_component *component)
@@ -1255,9 +1254,9 @@ static int soc_probe_component(struct snd_soc_card *card, 
		return 0;

	}



	if (!component->driver->module_get_upon_open &&

	    !try_module_get(component->dev->driver->owner))

		return -ENODEV;

	ret = snd_soc_component_module_get_when_probe(component);

	if (ret < 0)

		return ret;



	component->card = card;

	dapm->card = card;

sound/soc/soc-pcm.c

+4 −6
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/delay.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pm_runtime.h>

#include <linux/module.h>

#include <linux/slab.h>

#include <linux/workqueue.h>

#include <linux/export.h>
@@ -440,12 +439,12 @@ static int soc_pcm_components_open(struct snd_pcm_substream *substream, 
		component = rtdcom->component;

		*last = component;



		if (component->driver->module_get_upon_open &&

		    !try_module_get(component->dev->driver->owner)) {

		ret = snd_soc_component_module_get_when_open(component);

		if (ret < 0) {

			dev_err(component->dev,

				"ASoC: can't get module %s\n",

				component->name);

			return -ENODEV;

			return ret;

		}



		if (!component->driver->ops ||
@@ -481,8 +480,7 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream, 
		    component->driver->ops->close)

			component->driver->ops->close(substream);



		if (component->driver->module_get_upon_open)

			module_put(component->dev->driver->owner);

		snd_soc_component_module_put_when_close(component);

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE