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
325325 return regcache_sync(component->regmap);
326326 }
327327
328−int snd_soc_component_initialize(struct snd_soc_component *component,
329− const struct snd_soc_component_driver *driver,
330− struct device *dev, const char *name);
331328 void snd_soc_component_set_aux(struct snd_soc_component *component,
332329 struct snd_soc_aux_dev *aux);
333330 int 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
414414 }
415415 #endif
416416 int snd_soc_poweroff(struct device *dev);
417+int snd_soc_component_initialize(struct snd_soc_component *component,
418+ const struct snd_soc_component_driver *driver,
419+ struct device *dev, const char *name);
417420 int snd_soc_add_component(struct device *dev,
418421 struct snd_soc_component *component,
419422 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
3333 return ret;
3434 }
3535
36−int 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−
5236 void snd_soc_component_set_aux(struct snd_soc_component *component,
5337 struct snd_soc_aux_dev *aux)
5438 {
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
24382438 list_del(&component->list);
24392439 }
24402440
2441+int 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+}
2456+EXPORT_SYMBOL_GPL(snd_soc_component_initialize);
2457+
24412458 int snd_soc_add_component(struct device *dev,
24422459 struct snd_soc_component *component,
24432460 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