Skip to content

Commit 08ff720

Browse files
crojewsk-intelbroonie
authored andcommitted
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. Signed-off-by: Cezary Rojewski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 14e5ad7 commit 08ff720

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

include/sound/soc-component.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,6 @@ static inline int snd_soc_component_cache_sync(
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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,9 @@ static inline int snd_soc_resume(struct device *dev)
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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,6 @@ static inline int _soc_component_ret(struct snd_soc_component *component,
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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,6 +2438,23 @@ static void snd_soc_del_component_unlocked(struct snd_soc_component *component)
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,

0 commit comments

Comments
 (0)