History

ASoC: core: Relocate and expose snd_soc_component_initialize

To allow for two-step component registration, expose snd_soc_component_initialize function and move it back to soc-core.c.

Cezary Rojewski committed 6 years ago

Commit 08ff7201 parent 14e5ad74 files · +20 −19Browse files

Unified · Split

4 files
  1. include/sound/soc-component.h +0 −3
  2. include/sound/soc.h +3 −0
  3. sound/soc/soc-component.c +0 −16
  4. sound/soc/soc-core.c +17 −0
include/sound/soc-component.h+0−3
@@ -325,9 +325,6 @@ static inline int snd_soc_component_cache_sync( · 324 unmodified lines
325 return regcache_sync(component->regmap);325 return regcache_sync(component->regmap);
326}326}
327 327
328int snd_soc_component_initialize(struct snd_soc_component *component,
329 const struct snd_soc_component_driver *driver,
330 struct device *dev, const char *name);
331void snd_soc_component_set_aux(struct snd_soc_component *component,328void snd_soc_component_set_aux(struct snd_soc_component *component,
332 struct snd_soc_aux_dev *aux);329 struct snd_soc_aux_dev *aux);
333int snd_soc_component_init(struct snd_soc_component *component);330int snd_soc_component_init(struct snd_soc_component *component);
include/sound/soc.h+3−0
@@ -414,6 +414,9 @@ static inline int snd_soc_resume(struct device *dev) · 413 unmodified lines
414}414}
415#endif415#endif
416int snd_soc_poweroff(struct device *dev);416int snd_soc_poweroff(struct device *dev);
417int snd_soc_component_initialize(struct snd_soc_component *component,
418 const struct snd_soc_component_driver *driver,
419 struct device *dev, const char *name);
417int snd_soc_add_component(struct device *dev,420int snd_soc_add_component(struct device *dev,
418 struct snd_soc_component *component,421 struct snd_soc_component *component,
419 const struct snd_soc_component_driver *component_driver,422 const struct snd_soc_component_driver *component_driver,
sound/soc/soc-component.c+0−16
@@ -33,22 +33,6 @@ static inline int _soc_component_ret(struct snd_soc_component *component, · 32 unmodified lines
33 return ret;33 return ret;
34}34}
35 35
36int snd_soc_component_initialize(struct snd_soc_component *component,
37 const struct snd_soc_component_driver *driver,
38 struct device *dev, const char *name)
39{
40 INIT_LIST_HEAD(&component->dai_list);
41 INIT_LIST_HEAD(&component->dobj_list);
42 INIT_LIST_HEAD(&component->card_list);
43 mutex_init(&component->io_mutex);
44
45 component->name = name;
46 component->dev = dev;
47 component->driver = driver;
48
49 return 0;
50}
51
52void snd_soc_component_set_aux(struct snd_soc_component *component,36void snd_soc_component_set_aux(struct snd_soc_component *component,
53 struct snd_soc_aux_dev *aux)37 struct snd_soc_aux_dev *aux)
54{38{
sound/soc/soc-core.c+17−0
@@ -2438,6 +2438,23 @@ static void snd_soc_del_component_unlocked(struct snd_soc_component *component) · 2437 unmodified lines
2438 list_del(&component->list);2438 list_del(&component->list);
2439}2439}
2440 2440
2441int snd_soc_component_initialize(struct snd_soc_component *component,
2442 const struct snd_soc_component_driver *driver,
2443 struct device *dev, const char *name)
2444{
2445 INIT_LIST_HEAD(&component->dai_list);
2446 INIT_LIST_HEAD(&component->dobj_list);
2447 INIT_LIST_HEAD(&component->card_list);
2448 mutex_init(&component->io_mutex);
2449
2450 component->name = name;
2451 component->dev = dev;
2452 component->driver = driver;
2453
2454 return 0;
2455}
2456EXPORT_SYMBOL_GPL(snd_soc_component_initialize);
2457
2441int snd_soc_add_component(struct device *dev,2458int snd_soc_add_component(struct device *dev,
2442 struct snd_soc_component *component,2459 struct snd_soc_component *component,
2443 const struct snd_soc_component_driver *component_driver,2460 const struct snd_soc_component_driver *component_driver,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t