History

ASoC: core: Simplify snd_soc_component_initialize declaration

Move 'name' field initialization responsibility back to snd_soc_component_initialize to prepare snd_soc_add_component function for being called separatelly as a second registration step.

Cezary Rojewski committed 6 years ago

Commit 7274d4c1 parent 08ff7202 files · +9 −11Browse files

Unified · Split

2 files
  1. include/sound/soc.h +1 −1
  2. sound/soc/soc-core.c +8 −10
include/sound/soc.h+1−1
@@ -416,7 +416,7 @@ static inline int snd_soc_resume(struct device *dev) · 415 unmodified lines
416int snd_soc_poweroff(struct device *dev);416int snd_soc_poweroff(struct device *dev);
417int snd_soc_component_initialize(struct snd_soc_component *component,417int snd_soc_component_initialize(struct snd_soc_component *component,
418 const struct snd_soc_component_driver *driver,418 const struct snd_soc_component_driver *driver,
419 struct device *dev, const char *name);419 struct device *dev);
420int snd_soc_add_component(struct device *dev,420int snd_soc_add_component(struct device *dev,
421 struct snd_soc_component *component,421 struct snd_soc_component *component,
422 const struct snd_soc_component_driver *component_driver,422 const struct snd_soc_component_driver *component_driver,
sound/soc/soc-core.c+8−10
@@ -2440,14 +2440,19 @@ static void snd_soc_del_component_unlocked(struct snd_soc_component *component) · 2439 unmodified lines
2440 2440
2441int snd_soc_component_initialize(struct snd_soc_component *component,2441int snd_soc_component_initialize(struct snd_soc_component *component,
2442 const struct snd_soc_component_driver *driver,2442 const struct snd_soc_component_driver *driver,
2443 struct device *dev, const char *name)2443 struct device *dev)
2444{2444{
2445 INIT_LIST_HEAD(&component->dai_list);2445 INIT_LIST_HEAD(&component->dai_list);
2446 INIT_LIST_HEAD(&component->dobj_list);2446 INIT_LIST_HEAD(&component->dobj_list);
2447 INIT_LIST_HEAD(&component->card_list);2447 INIT_LIST_HEAD(&component->card_list);
2448 mutex_init(&component->io_mutex);2448 mutex_init(&component->io_mutex);
2449 2449
2450 component->name = name;2450 component->name = fmt_single_name(dev, &component->id);
2451 if (!component->name) {
2452 dev_err(dev, "ASoC: Failed to allocate name\n");
2453 return -ENOMEM;
2454 }
2455
2451 component->dev = dev;2456 component->dev = dev;
2452 component->driver = driver;2457 component->driver = driver;
2453 2458
@@ -2461,19 +2466,12 @@ int snd_soc_add_component(struct device *dev, · 7 unmodified lines
2461 struct snd_soc_dai_driver *dai_drv,2466 struct snd_soc_dai_driver *dai_drv,
2462 int num_dai)2467 int num_dai)
2463{2468{
2464 const char *name = fmt_single_name(dev, &component->id);
2465 int ret;2469 int ret;
2466 int i;2470 int i;
2467 2471
2468 if (!name) {
2469 dev_err(dev, "ASoC: Failed to allocate name\n");
2470 return -ENOMEM;
2471 }
2472
2473 mutex_lock(&client_mutex);2472 mutex_lock(&client_mutex);
2474 2473
2475 ret = snd_soc_component_initialize(component, component_driver,2474 ret = snd_soc_component_initialize(component, component_driver, dev);
2476 dev, name);
2477 if (ret)2475 if (ret)
2478 goto err_free;2476 goto err_free;
2479 2477

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