Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 120295
b: refs/heads/master
c: 12a48a8
h: refs/heads/master
i:
  120293: da83e70
  120291: a944d20
  120287: a67b1a4
v: v3
  • Loading branch information
Mark Brown committed Dec 9, 2008
1 parent be88725 commit 6e0e447
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3f4b783cfdebb559814690572041a17bc9744cf3
refs/heads/master: 12a48a8c0087ba39d926cf1d63938ccbdb9752c3
5 changes: 5 additions & 0 deletions trunk/include/sound/soc.h
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ struct snd_soc_ops;
struct snd_soc_dai_mode;
struct snd_soc_pcm_runtime;
struct snd_soc_dai;
struct snd_soc_platform;
struct snd_soc_codec;
struct soc_enum;
struct snd_soc_ac97_ops;
Expand All @@ -158,6 +159,9 @@ typedef int (*hw_read_t)(void *,char* ,int);

extern struct snd_ac97_bus_ops soc_ac97_ops;

int snd_soc_register_platform(struct snd_soc_platform *platform);
void snd_soc_unregister_platform(struct snd_soc_platform *platform);

/* pcm <-> DAI connect */
void snd_soc_free_pcms(struct snd_soc_device *socdev);
int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid);
Expand Down Expand Up @@ -296,6 +300,7 @@ struct snd_soc_codec_device {
/* SoC platform interface */
struct snd_soc_platform {
char *name;
struct list_head list;

int (*probe)(struct platform_device *pdev);
int (*remove)(struct platform_device *pdev);
Expand Down
38 changes: 38 additions & 0 deletions trunk/sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ static struct dentry *debugfs_root;
static DEFINE_MUTEX(client_mutex);
static LIST_HEAD(card_list);
static LIST_HEAD(dai_list);
static LIST_HEAD(platform_list);

static int snd_soc_register_card(struct snd_soc_card *card);
static int snd_soc_unregister_card(struct snd_soc_card *card);
Expand Down Expand Up @@ -2102,6 +2103,43 @@ void snd_soc_unregister_dais(struct snd_soc_dai *dai, size_t count)
}
EXPORT_SYMBOL_GPL(snd_soc_unregister_dais);

/**
* snd_soc_register_platform - Register a platform with the ASoC core
*
* @param platform platform to register
*/
int snd_soc_register_platform(struct snd_soc_platform *platform)
{
if (!platform->name)
return -EINVAL;

INIT_LIST_HEAD(&platform->list);

mutex_lock(&client_mutex);
list_add(&platform->list, &platform_list);
mutex_unlock(&client_mutex);

pr_debug("Registered platform '%s'\n", platform->name);

return 0;
}
EXPORT_SYMBOL_GPL(snd_soc_register_platform);

/**
* snd_soc_unregister_platform - Unregister a platform from the ASoC core
*
* @param platform platform to unregister
*/
void snd_soc_unregister_platform(struct snd_soc_platform *platform)
{
mutex_lock(&client_mutex);
list_del(&platform->list);
mutex_unlock(&client_mutex);

pr_debug("Unregistered platform '%s'\n", platform->name);
}
EXPORT_SYMBOL_GPL(snd_soc_unregister_platform);

static int __devinit snd_soc_init(void)
{
#ifdef CONFIG_DEBUG_FS
Expand Down

0 comments on commit 6e0e447

Please sign in to comment.