leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87h8795ro4.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-07-26 13:49:54 +09:00 committed by Mark Brown
parent 4ff1fef10f
commit 4a81e8f30d
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/sound/soc-component.h
View File

@ -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)
{

18
sound/soc/soc-component.c
View File

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

9
sound/soc/soc-core.c
View File

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

10
sound/soc/soc-pcm.c
View File

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