September 2018 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [PATCH] ASoC: max98373: usleep_range() needs include/delay.h
by Benson Leung 07 Sep '18

07 Sep '18

Hi Grant, On Thu, Sep 06, 2018 at 05:27:28PM -0700, Grant Grundler wrote: > Commit ca917f9fe1a0fab added use of usleep_range() but not > the corresponding "include <linux/delay.h>". The result is > with Chrome OS won't build because warnings are forced > to be errors: > mnt/host/source/src/third_party/kernel/v4.4/sound/soc/codecs/max98373.c:734:2: error: implicit declaration of function 'usleep_range' [-Werror,-Wimplicit-function-declaration] > usleep_range(10000, 11000); > ^ > > Including delay.h "fixes" this. > > Signed-off-by: Grant Grundler <grundler(a)chromium.org> Reviewed-by: Benson Leung <bleung(a)chromium.org> Thanks! -- Benson Leung Staff Software Engineer Chrome OS Kernel Google Inc. bleung(a)google.com Chromium OS Project bleung(a)chromium.org

1 0

[alsa-devel] [asoc:for-4.20 399/404] sound/soc/soc-dapm.c:3768:9: warning: 'ret' may be used uninitialized in this function
by kbuild test robot 06 Sep '18

06 Sep '18

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-4.20 head: 9ab708aef61f5620113269a9d1bdb1543d1207d0 commit: 4a75aae17b2a802a7267206414050408392c374c [399/404] ASoC: dapm: Add support for multi-CODEC CODEC to CODEC links config: x86_64-randconfig-x006-201835 (attached as .config) compiler: gcc-7 (Debian 7.3.0-1) 7.3.0 reproduce: git checkout 4a75aae17b2a802a7267206414050408392c374c # save the attached .config to linux build tree make ARCH=x86_64 Note: it may well be a FALSE warning. FWIW you are at least aware of it now. http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings All warnings (new ones prefixed by >>): Cyclomatic Complexity 3 sound/soc/soc-dapm.c:dapm_power_one_widget Cyclomatic Complexity 6 sound/soc/soc-dapm.c:snd_soc_dapm_check_dynamic_path Cyclomatic Complexity 2 sound/soc/soc-dapm.c:soc_dapm_update_bits Cyclomatic Complexity 15 sound/soc/soc-dapm.c:dapm_widget_update Cyclomatic Complexity 3 sound/soc/soc-dapm.c:pop_dbg Cyclomatic Complexity 12 sound/soc/soc-dapm.c:dapm_seq_check_event Cyclomatic Complexity 1 sound/soc/soc-dapm.c:dapm_free_path Cyclomatic Complexity 1 sound/soc/soc-dapm.c:dapm_kcontrol_free Cyclomatic Complexity 2 sound/soc/soc-dapm.c:pop_wait Cyclomatic Complexity 13 sound/soc/soc-dapm.c:dapm_seq_run_coalesced Cyclomatic Complexity 42 sound/soc/soc-dapm.c:dapm_seq_run Cyclomatic Complexity 13 sound/soc/soc-dapm.c:dapm_widget_show_component Cyclomatic Complexity 3 sound/soc/soc-dapm.c:dapm_widget_show Cyclomatic Complexity 6 sound/soc/soc-dapm.c:dapm_wcache_lookup Cyclomatic Complexity 2 sound/soc/soc-dapm.c:soc_dapm_read Cyclomatic Complexity 3 sound/soc/soc-dapm.c:dapm_connect_mux Cyclomatic Complexity 6 sound/soc/soc-dapm.c:dapm_set_mixer_path_status Cyclomatic Complexity 3 sound/soc/soc-dapm.c:dapm_connect_mixer Cyclomatic Complexity 17 sound/soc/soc-dapm.c:dapm_update_widget_flags Cyclomatic Complexity 22 sound/soc/soc-dapm.c:snd_soc_dapm_add_path Cyclomatic Complexity 19 sound/soc/soc-dapm.c:snd_soc_dapm_add_route Cyclomatic Complexity 10 sound/soc/soc-dapm.c:snd_soc_dapm_del_route Cyclomatic Complexity 7 sound/soc/soc-dapm.c:dapm_find_widget Cyclomatic Complexity 11 sound/soc/soc-dapm.c:snd_soc_dapm_weak_route Cyclomatic Complexity 4 sound/soc/soc-dapm.c:snd_soc_dapm_set_pin Cyclomatic Complexity 4 sound/soc/soc-dapm.c:dapm_new_dai_link Cyclomatic Complexity 9 sound/soc/soc-dapm.c:dapm_is_shared_kcontrol Cyclomatic Complexity 3 sound/soc/soc-dapm.c:dapm_kcontrol_add_widget Cyclomatic Complexity 17 sound/soc/soc-dapm.c:dapm_widget_power_read_file Cyclomatic Complexity 2 sound/soc/soc-dapm.c:soc_dapm_test_bits Cyclomatic Complexity 8 sound/soc/soc-dapm.c:dapm_supply_check_power Cyclomatic Complexity 2 sound/soc/soc-dapm.c:snd_soc_dapm_free_kcontrol Cyclomatic Complexity 42 sound/soc/soc-dapm.c:snd_soc_dai_link_event Cyclomatic Complexity 2 include/linux/device.h:devm_kmalloc_array Cyclomatic Complexity 1 include/linux/device.h:devm_kcalloc Cyclomatic Complexity 6 sound/soc/soc-dapm.c:snd_soc_dapm_alloc_kcontrol Cyclomatic Complexity 1 sound/soc/soc-dapm.c:dapm_debugfs_cleanup Cyclomatic Complexity 7 sound/soc/soc-dapm.c:dapm_mark_endpoints_dirty Cyclomatic Complexity 1 sound/soc/soc-dapm.c:dapm_kcontrol_get_value Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_kcontrol_widget Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_kcontrol_dapm Cyclomatic Complexity 3 sound/soc/soc-dapm.c:snd_soc_dapm_force_bias_level Cyclomatic Complexity 9 sound/soc/soc-dapm.c:snd_soc_dapm_set_bias_level Cyclomatic Complexity 10 sound/soc/soc-dapm.c:dapm_pre_sequence_async Cyclomatic Complexity 11 sound/soc/soc-dapm.c:dapm_post_sequence_async Cyclomatic Complexity 47 sound/soc/soc-dapm.c:dapm_power_widgets Cyclomatic Complexity 9 sound/soc/soc-dapm.c:soc_dapm_mux_update_power Cyclomatic Complexity 9 sound/soc/soc-dapm.c:soc_dapm_mixer_update_power Cyclomatic Complexity 3 sound/soc/soc-dapm.c:soc_dapm_stream_event Cyclomatic Complexity 9 sound/soc/soc-dapm.c:soc_dapm_shutdown_dapm Cyclomatic Complexity 6 sound/soc/soc-dapm.c:snd_soc_dapm_dai_get_connected_widgets Cyclomatic Complexity 6 sound/soc/soc-dapm.c:dapm_regulator_event Cyclomatic Complexity 4 sound/soc/soc-dapm.c:dapm_pinctrl_event Cyclomatic Complexity 3 sound/soc/soc-dapm.c:dapm_clock_event Cyclomatic Complexity 4 sound/soc/soc-dapm.c:snd_soc_dapm_debugfs_init Cyclomatic Complexity 2 sound/soc/soc-dapm.c:snd_soc_dapm_mux_update_power Cyclomatic Complexity 2 sound/soc/soc-dapm.c:snd_soc_dapm_mixer_update_power Cyclomatic Complexity 6 sound/soc/soc-dapm.c:snd_soc_dapm_free_widget Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_reset_cache Cyclomatic Complexity 6 sound/soc/soc-dapm.c:dapm_free_widgets Cyclomatic Complexity 3 sound/soc/soc-dapm.c:snd_soc_dapm_sync_unlocked Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_sync Cyclomatic Complexity 4 sound/soc/soc-dapm.c:snd_soc_dapm_add_routes Cyclomatic Complexity 2 sound/soc/soc-dapm.c:snd_soc_dapm_del_routes Cyclomatic Complexity 3 sound/soc/soc-dapm.c:snd_soc_dapm_weak_routes Cyclomatic Complexity 11 sound/soc/soc-dapm.c:snd_soc_dapm_get_volsw Cyclomatic Complexity 11 sound/soc/soc-dapm.c:snd_soc_dapm_put_volsw Cyclomatic Complexity 5 sound/soc/soc-dapm.c:snd_soc_dapm_get_enum_double Cyclomatic Complexity 8 sound/soc/soc-dapm.c:snd_soc_dapm_put_enum_double Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_info_pin_switch Cyclomatic Complexity 24 sound/soc/soc-dapm.c:snd_soc_dapm_new_control_unlocked Cyclomatic Complexity 13 sound/soc/soc-dapm.c:dapm_kcontrol_data_alloc Cyclomatic Complexity 14 sound/soc/soc-dapm.c:dapm_create_or_share_kcontrol Cyclomatic Complexity 9 sound/soc/soc-dapm.c:dapm_new_mixer Cyclomatic Complexity 10 sound/soc/soc-dapm.c:dapm_new_mux Cyclomatic Complexity 3 sound/soc/soc-dapm.c:dapm_new_pga Cyclomatic Complexity 13 sound/soc/soc-dapm.c:snd_soc_dapm_new_widgets Cyclomatic Complexity 6 sound/soc/soc-dapm.c:snd_soc_dapm_new_dai Cyclomatic Complexity 8 sound/soc/soc-dapm.c:dapm_connect_dai_link_widgets Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_new_control Cyclomatic Complexity 3 sound/soc/soc-dapm.c:snd_soc_dapm_new_controls Cyclomatic Complexity 6 sound/soc/soc-dapm.c:snd_soc_dapm_new_dai_widgets Cyclomatic Complexity 14 sound/soc/soc-dapm.c:snd_soc_dapm_link_dai_widgets Cyclomatic Complexity 5 sound/soc/soc-dapm.c:snd_soc_dapm_connect_dai_link_widgets Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_stream_event Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_enable_pin_unlocked Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_enable_pin Cyclomatic Complexity 3 sound/soc/soc-dapm.c:snd_soc_dapm_force_enable_pin_unlocked Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_force_enable_pin Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_disable_pin_unlocked Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_disable_pin Cyclomatic Complexity 2 sound/soc/soc-dapm.c:snd_soc_dapm_put_pin_switch Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_nc_pin_unlocked Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_nc_pin Cyclomatic Complexity 2 sound/soc/soc-dapm.c:snd_soc_dapm_get_pin_status Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_get_pin_switch Cyclomatic Complexity 2 sound/soc/soc-dapm.c:snd_soc_dapm_ignore_suspend Cyclomatic Complexity 1 sound/soc/soc-dapm.c:snd_soc_dapm_free Cyclomatic Complexity 7 sound/soc/soc-dapm.c:snd_soc_dapm_shutdown sound/soc/soc-dapm.c: In function 'snd_soc_dai_link_event': >> sound/soc/soc-dapm.c:3768:9: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized] return ret; ^~~ vim +/ret +3768 sound/soc/soc-dapm.c 4ba1327a Mark Brown 2008-05-13 3613 c74184ed Mark Brown 2012-04-04 3614 static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, c74184ed Mark Brown 2012-04-04 3615 struct snd_kcontrol *kcontrol, int event) c74184ed Mark Brown 2012-04-04 3616 { 4a75aae1 Charles Keepax 2018-09-05 3617 struct snd_soc_dapm_path *path; c74184ed Mark Brown 2012-04-04 3618 struct snd_soc_dai *source, *sink; 249dc495 Charles Keepax 2018-08-15 3619 struct snd_soc_pcm_runtime *rtd = w->priv; c6615082 Nikesh Oswal 2015-02-02 3620 const struct snd_soc_pcm_stream *config = w->params + w->params_select; c74184ed Mark Brown 2012-04-04 3621 struct snd_pcm_substream substream; 9747cec2 Mark Brown 2012-04-26 3622 struct snd_pcm_hw_params *params = NULL; 8053f216 Nicolin Chen 2016-07-26 3623 struct snd_pcm_runtime *runtime = NULL; 3ba66feb Takashi Iwai 2018-07-25 3624 unsigned int fmt; c74184ed Mark Brown 2012-04-04 3625 int ret; c74184ed Mark Brown 2012-04-04 3626 bf4edea8 Takashi Iwai 2013-11-07 3627 if (WARN_ON(!config) || a3423b02 Lars-Peter Clausen 2015-08-11 3628 WARN_ON(list_empty(&w->edges[SND_SOC_DAPM_DIR_OUT]) || a3423b02 Lars-Peter Clausen 2015-08-11 3629 list_empty(&w->edges[SND_SOC_DAPM_DIR_IN]))) bf4edea8 Takashi Iwai 2013-11-07 3630 return -EINVAL; c74184ed Mark Brown 2012-04-04 3631 c74184ed Mark Brown 2012-04-04 3632 /* Be a little careful as we don't want to overflow the mask array */ c74184ed Mark Brown 2012-04-04 3633 if (config->formats) { c74184ed Mark Brown 2012-04-04 3634 fmt = ffs(config->formats) - 1; c74184ed Mark Brown 2012-04-04 3635 } else { 30a6a1a4 Liam Girdwood 2012-11-19 3636 dev_warn(w->dapm->dev, "ASoC: Invalid format %llx specified\n", c74184ed Mark Brown 2012-04-04 3637 config->formats); c74184ed Mark Brown 2012-04-04 3638 fmt = 0; c74184ed Mark Brown 2012-04-04 3639 } c74184ed Mark Brown 2012-04-04 3640 c74184ed Mark Brown 2012-04-04 3641 /* Currently very limited parameter selection */ 9747cec2 Mark Brown 2012-04-26 3642 params = kzalloc(sizeof(*params), GFP_KERNEL); 9747cec2 Mark Brown 2012-04-26 3643 if (!params) { 9747cec2 Mark Brown 2012-04-26 3644 ret = -ENOMEM; 9747cec2 Mark Brown 2012-04-26 3645 goto out; 9747cec2 Mark Brown 2012-04-26 3646 } 9747cec2 Mark Brown 2012-04-26 3647 snd_mask_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), fmt); c74184ed Mark Brown 2012-04-04 3648 9747cec2 Mark Brown 2012-04-26 3649 hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min = c74184ed Mark Brown 2012-04-04 3650 config->rate_min; 9747cec2 Mark Brown 2012-04-26 3651 hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max = c74184ed Mark Brown 2012-04-04 3652 config->rate_max; c74184ed Mark Brown 2012-04-04 3653 9747cec2 Mark Brown 2012-04-26 3654 hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min c74184ed Mark Brown 2012-04-04 3655 = config->channels_min; 9747cec2 Mark Brown 2012-04-26 3656 hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max c74184ed Mark Brown 2012-04-04 3657 = config->channels_max; c74184ed Mark Brown 2012-04-04 3658 c74184ed Mark Brown 2012-04-04 3659 memset(&substream, 0, sizeof(substream)); c74184ed Mark Brown 2012-04-04 3660 8053f216 Nicolin Chen 2016-07-26 3661 /* Allocate a dummy snd_pcm_runtime for startup() and other ops() */ 8053f216 Nicolin Chen 2016-07-26 3662 runtime = kzalloc(sizeof(*runtime), GFP_KERNEL); 8053f216 Nicolin Chen 2016-07-26 3663 if (!runtime) { 8053f216 Nicolin Chen 2016-07-26 3664 ret = -ENOMEM; 8053f216 Nicolin Chen 2016-07-26 3665 goto out; 8053f216 Nicolin Chen 2016-07-26 3666 } 8053f216 Nicolin Chen 2016-07-26 3667 substream.runtime = runtime; 249dc495 Charles Keepax 2018-08-15 3668 substream.private_data = rtd; 8053f216 Nicolin Chen 2016-07-26 3669 c74184ed Mark Brown 2012-04-04 3670 switch (event) { c74184ed Mark Brown 2012-04-04 3671 case SND_SOC_DAPM_PRE_PMU: c74184ed Mark Brown 2012-04-04 3672 substream.stream = SNDRV_PCM_STREAM_CAPTURE; 4a75aae1 Charles Keepax 2018-09-05 3673 snd_soc_dapm_widget_for_each_source_path(w, path) { 4a75aae1 Charles Keepax 2018-09-05 3674 source = path->source->priv; 4a75aae1 Charles Keepax 2018-09-05 3675 9900a422 Kuninori Morimoto 2017-09-25 3676 if (source->driver->ops->startup) { 4a75aae1 Charles Keepax 2018-09-05 3677 ret = source->driver->ops->startup(&substream, 4a75aae1 Charles Keepax 2018-09-05 3678 source); 9b8ef9f6 Jeeja KP 2015-10-20 3679 if (ret < 0) { 9b8ef9f6 Jeeja KP 2015-10-20 3680 dev_err(source->dev, 4a75aae1 Charles Keepax 2018-09-05 3681 "ASoC: startup() failed: %d\n", 4a75aae1 Charles Keepax 2018-09-05 3682 ret); 9b8ef9f6 Jeeja KP 2015-10-20 3683 goto out; 9b8ef9f6 Jeeja KP 2015-10-20 3684 } 9b8ef9f6 Jeeja KP 2015-10-20 3685 source->active++; 9b8ef9f6 Jeeja KP 2015-10-20 3686 } 93e6958a Benoit Cousson 2014-07-08 3687 ret = soc_dai_hw_params(&substream, params, source); 93e6958a Benoit Cousson 2014-07-08 3688 if (ret < 0) 9747cec2 Mark Brown 2012-04-26 3689 goto out; 4a75aae1 Charles Keepax 2018-09-05 3690 } c74184ed Mark Brown 2012-04-04 3691 c74184ed Mark Brown 2012-04-04 3692 substream.stream = SNDRV_PCM_STREAM_PLAYBACK; 4a75aae1 Charles Keepax 2018-09-05 3693 snd_soc_dapm_widget_for_each_sink_path(w, path) { 4a75aae1 Charles Keepax 2018-09-05 3694 sink = path->sink->priv; 4a75aae1 Charles Keepax 2018-09-05 3695 9900a422 Kuninori Morimoto 2017-09-25 3696 if (sink->driver->ops->startup) { 4a75aae1 Charles Keepax 2018-09-05 3697 ret = sink->driver->ops->startup(&substream, 4a75aae1 Charles Keepax 2018-09-05 3698 sink); 9b8ef9f6 Jeeja KP 2015-10-20 3699 if (ret < 0) { 9b8ef9f6 Jeeja KP 2015-10-20 3700 dev_err(sink->dev, 4a75aae1 Charles Keepax 2018-09-05 3701 "ASoC: startup() failed: %d\n", 4a75aae1 Charles Keepax 2018-09-05 3702 ret); 9b8ef9f6 Jeeja KP 2015-10-20 3703 goto out; 9b8ef9f6 Jeeja KP 2015-10-20 3704 } 9b8ef9f6 Jeeja KP 2015-10-20 3705 sink->active++; 9b8ef9f6 Jeeja KP 2015-10-20 3706 } 93e6958a Benoit Cousson 2014-07-08 3707 ret = soc_dai_hw_params(&substream, params, sink); 93e6958a Benoit Cousson 2014-07-08 3708 if (ret < 0) 9747cec2 Mark Brown 2012-04-26 3709 goto out; 4a75aae1 Charles Keepax 2018-09-05 3710 } c74184ed Mark Brown 2012-04-04 3711 break; c74184ed Mark Brown 2012-04-04 3712 c74184ed Mark Brown 2012-04-04 3713 case SND_SOC_DAPM_POST_PMU: 4a75aae1 Charles Keepax 2018-09-05 3714 snd_soc_dapm_widget_for_each_sink_path(w, path) { 4a75aae1 Charles Keepax 2018-09-05 3715 sink = path->sink->priv; 4a75aae1 Charles Keepax 2018-09-05 3716 da18396f Mark Brown 2013-02-06 3717 ret = snd_soc_dai_digital_mute(sink, 0, da18396f Mark Brown 2013-02-06 3718 SNDRV_PCM_STREAM_PLAYBACK); c74184ed Mark Brown 2012-04-04 3719 if (ret != 0 && ret != -ENOTSUPP) 4a75aae1 Charles Keepax 2018-09-05 3720 dev_warn(sink->dev, 4a75aae1 Charles Keepax 2018-09-05 3721 "ASoC: Failed to unmute: %d\n", ret); 9747cec2 Mark Brown 2012-04-26 3722 ret = 0; 4a75aae1 Charles Keepax 2018-09-05 3723 } c74184ed Mark Brown 2012-04-04 3724 break; c74184ed Mark Brown 2012-04-04 3725 c74184ed Mark Brown 2012-04-04 3726 case SND_SOC_DAPM_PRE_PMD: 4a75aae1 Charles Keepax 2018-09-05 3727 snd_soc_dapm_widget_for_each_sink_path(w, path) { 4a75aae1 Charles Keepax 2018-09-05 3728 sink = path->sink->priv; 4a75aae1 Charles Keepax 2018-09-05 3729 da18396f Mark Brown 2013-02-06 3730 ret = snd_soc_dai_digital_mute(sink, 1, da18396f Mark Brown 2013-02-06 3731 SNDRV_PCM_STREAM_PLAYBACK); c74184ed Mark Brown 2012-04-04 3732 if (ret != 0 && ret != -ENOTSUPP) 4a75aae1 Charles Keepax 2018-09-05 3733 dev_warn(sink->dev, 4a75aae1 Charles Keepax 2018-09-05 3734 "ASoC: Failed to mute: %d\n", ret); 9747cec2 Mark Brown 2012-04-26 3735 ret = 0; 4a75aae1 Charles Keepax 2018-09-05 3736 } 4a75aae1 Charles Keepax 2018-09-05 3737 4a75aae1 Charles Keepax 2018-09-05 3738 snd_soc_dapm_widget_for_each_source_path(w, path) { 4a75aae1 Charles Keepax 2018-09-05 3739 source = path->source->priv; 9b8ef9f6 Jeeja KP 2015-10-20 3740 9b8ef9f6 Jeeja KP 2015-10-20 3741 source->active--; 9900a422 Kuninori Morimoto 2017-09-25 3742 if (source->driver->ops->shutdown) { 9b8ef9f6 Jeeja KP 2015-10-20 3743 substream.stream = SNDRV_PCM_STREAM_CAPTURE; 4a75aae1 Charles Keepax 2018-09-05 3744 source->driver->ops->shutdown(&substream, 4a75aae1 Charles Keepax 2018-09-05 3745 source); 4a75aae1 Charles Keepax 2018-09-05 3746 } 9b8ef9f6 Jeeja KP 2015-10-20 3747 } 9b8ef9f6 Jeeja KP 2015-10-20 3748 4a75aae1 Charles Keepax 2018-09-05 3749 snd_soc_dapm_widget_for_each_sink_path(w, path) { 4a75aae1 Charles Keepax 2018-09-05 3750 sink = path->sink->priv; 4a75aae1 Charles Keepax 2018-09-05 3751 9b8ef9f6 Jeeja KP 2015-10-20 3752 sink->active--; 9900a422 Kuninori Morimoto 2017-09-25 3753 if (sink->driver->ops->shutdown) { 9b8ef9f6 Jeeja KP 2015-10-20 3754 substream.stream = SNDRV_PCM_STREAM_PLAYBACK; 9b8ef9f6 Jeeja KP 2015-10-20 3755 sink->driver->ops->shutdown(&substream, sink); 9b8ef9f6 Jeeja KP 2015-10-20 3756 } 4a75aae1 Charles Keepax 2018-09-05 3757 } c74184ed Mark Brown 2012-04-04 3758 break; c74184ed Mark Brown 2012-04-04 3759 c74184ed Mark Brown 2012-04-04 3760 default: a6ed0608 Takashi Iwai 2013-11-06 3761 WARN(1, "Unknown event %d\n", event); 75881df3 Sudip Mukherjee 2015-09-10 3762 ret = -EINVAL; c74184ed Mark Brown 2012-04-04 3763 } c74184ed Mark Brown 2012-04-04 3764 9747cec2 Mark Brown 2012-04-26 3765 out: 8053f216 Nicolin Chen 2016-07-26 3766 kfree(runtime); 9747cec2 Mark Brown 2012-04-26 3767 kfree(params); 9747cec2 Mark Brown 2012-04-26 @3768 return ret; c74184ed Mark Brown 2012-04-04 3769 } c74184ed Mark Brown 2012-04-04 3770 :::::: The code at line 3768 was first introduced by commit :::::: 9747cec21e2d55ee996249b01ec30dd32389c0ba ASoC: dapm: Move CODEC<->CODEC params off stack :::::: TO: Mark Brown <broonie(a)opensource.wolfsonmicro.com> :::::: CC: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

2 1

[alsa-devel] [PATCH] ASoC: rsnd: Add device tree binding for r8a77990
by Yoshihiro Kaneko 06 Sep '18

06 Sep '18

From: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> This patch adds the device tree binding of the r8a77990 SoC. Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx(a)renesas.com> Signed-off-by: Yoshihiro Kaneko <ykaneko0929(a)gmail.com> --- This patch is based on the devel branch of Simon Horman's renesas tree. Documentation/devicetree/bindings/sound/renesas,rsnd.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt index b86d790..07aba8d 100644 --- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt +++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt @@ -352,6 +352,7 @@ Required properties: - "renesas,rcar_sound-r8a7794" (R-Car E2) - "renesas,rcar_sound-r8a7795" (R-Car H3) - "renesas,rcar_sound-r8a7796" (R-Car M3-W) + - "renesas,rcar_sound-r8a77990" (R-Car E3) - reg : Should contain the register physical address. required register is SRU/ADG/SSI if generation1 -- 1.9.1

5 5

[alsa-devel] [PATCH] ASoC: sgtl5000: avoid division by zero if lo_vag is zero
by Colin King 06 Sep '18

06 Sep '18

From: Colin Ian King <colin.king(a)canonical.com> In the case where lo_vag <= SGTL5000_LINE_OUT_GND_BASE, lo_vag is set to zero and later vol_quot is computed by dividing by lo_vag causing a division by zero error. Fix this by avoiding a zero division and set vol_quot to zero in this specific case so that the lowest setting for i is correctly set. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/sgtl5000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 60764f6201b1..add18d6d77da 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -1218,7 +1218,7 @@ static int sgtl5000_set_power_regs(struct snd_soc_component *component) * Searching for a suitable index solving this formula: * idx = 40 * log10(vag_val / lo_cagcntrl) + 15 */ - vol_quot = (vag * 100) / lo_vag; + vol_quot = lo_vag ? (vag * 100) / lo_vag : 0; lo_vol = 0; for (i = 0; i < ARRAY_SIZE(vol_quot_table); i++) { if (vol_quot >= vol_quot_table[i]) -- 2.17.1

4 3

[alsa-devel] Applied "ASoC: dapm: Move error handling to snd_soc_dapm_new_control_unlocked" to the asoc tree
by Mark Brown 06 Sep '18

06 Sep '18

The patch ASoC: dapm: Move error handling to snd_soc_dapm_new_control_unlocked has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 3bbf5d34fd4a0c41246290b70338095ae291851b Mon Sep 17 00:00:00 2001 From: Charles Keepax <ckeepax(a)opensource.cirrus.com> Date: Wed, 5 Sep 2018 15:20:58 +0100 Subject: [PATCH] ASoC: dapm: Move error handling to snd_soc_dapm_new_control_unlocked Currently DAPM has a lot of similar code to handle errors from snd_soc_dapm_new_control_unlocked, and much of this code does not really accurately reflect what the function returns. Firstly, most places will check for a return value of -EPROBE_DEFER and silence any error messages in that case. The one notable exception here being dapm_kcontrol_data_alloc which does currently print any error messages in the case of snd_soc_dapm_new_control_unlocked returning NULL or an error. Additionally the error prints being silenced in these case are redundant as snd_soc_dapm_new_control_unlocked can only return -EPROBE_DEFER or NULL when failing. Secondly, most places will treat a return value of NULL as an -ENOMEM. This is not correct either since any error except EPROBE_DEFER will cause a return value of NULL from snd_soc_dapm_new_control_unlocked. Centralise this handling and the error messages within snd_soc_dapm_new_control_unlocked and update the callers to simply check IS_ERR and return. Note that this update is slightly simpler in the case of dapm_kcontrol_data_alloc where that is fairly close to the handling that was already in place. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-dapm.c | 118 +++++++-------------------------------- sound/soc/soc-topology.c | 11 ---- 2 files changed, 19 insertions(+), 110 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 0a738cb439be..d13a25ce1275 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -364,10 +364,6 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, ret = PTR_ERR(data->widget); goto err_data; } - if (!data->widget) { - ret = -ENOMEM; - goto err_data; - } } break; case snd_soc_dapm_demux: @@ -402,10 +398,6 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, ret = PTR_ERR(data->widget); goto err_data; } - if (!data->widget) { - ret = -ENOMEM; - goto err_data; - } snd_soc_dapm_add_path(widget->dapm, data->widget, widget, NULL, NULL); @@ -3433,23 +3425,8 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); w = snd_soc_dapm_new_control_unlocked(dapm, widget); - /* Do not nag about probe deferrals */ - if (IS_ERR(w)) { - int ret = PTR_ERR(w); - - if (ret != -EPROBE_DEFER) - dev_err(dapm->dev, - "ASoC: Failed to create DAPM control %s (%d)\n", - widget->name, ret); - goto out_unlock; - } - if (!w) - dev_err(dapm->dev, - "ASoC: Failed to create DAPM control %s\n", - widget->name); - -out_unlock: mutex_unlock(&dapm->card->dapm_mutex); + return w; } EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control); @@ -3464,24 +3441,20 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, int ret; if ((w = dapm_cnew_widget(widget)) == NULL) - return NULL; + return ERR_PTR(-ENOMEM); switch (w->id) { case snd_soc_dapm_regulator_supply: w->regulator = devm_regulator_get(dapm->dev, w->name); if (IS_ERR(w->regulator)) { ret = PTR_ERR(w->regulator); - if (ret == -EPROBE_DEFER) - return ERR_PTR(ret); - dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", - w->name, ret); - return NULL; + goto request_failed; } if (w->on_val & SND_SOC_DAPM_REGULATOR_BYPASS) { ret = regulator_allow_bypass(w->regulator, true); if (ret != 0) - dev_warn(w->dapm->dev, + dev_warn(dapm->dev, "ASoC: Failed to bypass %s: %d\n", w->name, ret); } @@ -3490,22 +3463,14 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, w->pinctrl = devm_pinctrl_get(dapm->dev); if (IS_ERR(w->pinctrl)) { ret = PTR_ERR(w->pinctrl); - if (ret == -EPROBE_DEFER) - return ERR_PTR(ret); - dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", - w->name, ret); - return NULL; + goto request_failed; } break; case snd_soc_dapm_clock_supply: w->clk = devm_clk_get(dapm->dev, w->name); if (IS_ERR(w->clk)) { ret = PTR_ERR(w->clk); - if (ret == -EPROBE_DEFER) - return ERR_PTR(ret); - dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", - w->name, ret); - return NULL; + goto request_failed; } break; default: @@ -3519,7 +3484,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, w->name = kstrdup_const(widget->name, GFP_KERNEL); if (w->name == NULL) { kfree(w); - return NULL; + return ERR_PTR(-ENOMEM); } switch (w->id) { @@ -3596,6 +3561,13 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, /* machine layer sets up unconnected pins and insertions */ w->connected = 1; return w; + +request_failed: + if (ret != -EPROBE_DEFER) + dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", + w->name, ret); + + return ERR_PTR(ret); } /** @@ -3621,19 +3593,6 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, w = snd_soc_dapm_new_control_unlocked(dapm, widget); if (IS_ERR(w)) { ret = PTR_ERR(w); - /* Do not nag about probe deferrals */ - if (ret == -EPROBE_DEFER) - break; - dev_err(dapm->dev, - "ASoC: Failed to create DAPM control %s (%d)\n", - widget->name, ret); - break; - } - if (!w) { - dev_err(dapm->dev, - "ASoC: Failed to create DAPM control %s\n", - widget->name); - ret = -ENOMEM; break; } widget++; @@ -3944,21 +3903,8 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card, dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name); w = snd_soc_dapm_new_control_unlocked(&card->dapm, &template); - if (IS_ERR(w)) { - ret = PTR_ERR(w); - /* Do not nag about probe deferrals */ - if (ret != -EPROBE_DEFER) - dev_err(card->dev, - "ASoC: Failed to create %s widget (%d)\n", - link_name, ret); - goto outfree_kcontrol_news; - } - if (!w) { - dev_err(card->dev, "ASoC: Failed to create %s widget\n", - link_name); - ret = -ENOMEM; + if (IS_ERR(w)) goto outfree_kcontrol_news; - } w->params = params; w->num_params = num_params; @@ -3999,21 +3945,8 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, template.name); w = snd_soc_dapm_new_control_unlocked(dapm, &template); - if (IS_ERR(w)) { - int ret = PTR_ERR(w); - - /* Do not nag about probe deferrals */ - if (ret != -EPROBE_DEFER) - dev_err(dapm->dev, - "ASoC: Failed to create %s widget (%d)\n", - dai->driver->playback.stream_name, ret); - return ret; - } - if (!w) { - dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", - dai->driver->playback.stream_name); - return -ENOMEM; - } + if (IS_ERR(w)) + return PTR_ERR(w); w->priv = dai; dai->playback_widget = w; @@ -4028,21 +3961,8 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, template.name); w = snd_soc_dapm_new_control_unlocked(dapm, &template); - if (IS_ERR(w)) { - int ret = PTR_ERR(w); - - /* Do not nag about probe deferrals */ - if (ret != -EPROBE_DEFER) - dev_err(dapm->dev, - "ASoC: Failed to create %s widget (%d)\n", - dai->driver->playback.stream_name, ret); - return ret; - } - if (!w) { - dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", - dai->driver->capture.stream_name); - return -ENOMEM; - } + if (IS_ERR(w)) + return PTR_ERR(w); w->priv = dai; dai->capture_widget = w; diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 66e77e020745..17f81b9a5754 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1565,17 +1565,6 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, widget = snd_soc_dapm_new_control_unlocked(dapm, &template); if (IS_ERR(widget)) { ret = PTR_ERR(widget); - /* Do not nag about probe deferrals */ - if (ret != -EPROBE_DEFER) - dev_err(tplg->dev, - "ASoC: failed to create widget %s controls (%d)\n", - w->name, ret); - goto hdr_err; - } - if (widget == NULL) { - dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n", - w->name); - ret = -ENOMEM; goto hdr_err; } -- 2.19.0.rc1

1 0

[alsa-devel] Applied "ASoC: dapm: Cosmetic tidy up of snd_soc_dapm_new_control" to the asoc tree
by Mark Brown 06 Sep '18

06 Sep '18

The patch ASoC: dapm: Cosmetic tidy up of snd_soc_dapm_new_control has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 94e630a35d3383b42f12a873a5404bdf61e38e42 Mon Sep 17 00:00:00 2001 From: Charles Keepax <ckeepax(a)opensource.cirrus.com> Date: Wed, 5 Sep 2018 15:20:59 +0100 Subject: [PATCH] ASoC: dapm: Cosmetic tidy up of snd_soc_dapm_new_control Move the function snd_soc_dapm_new_control to be next to snd_soc_dapm_new_controls and add some kernel doc for it. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-dapm.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d13a25ce1275..c111e69b9a09 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3417,20 +3417,6 @@ int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol, } EXPORT_SYMBOL_GPL(snd_soc_dapm_put_pin_switch); -struct snd_soc_dapm_widget * -snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, - const struct snd_soc_dapm_widget *widget) -{ - struct snd_soc_dapm_widget *w; - - mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); - w = snd_soc_dapm_new_control_unlocked(dapm, widget); - mutex_unlock(&dapm->card->dapm_mutex); - - return w; -} -EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control); - struct snd_soc_dapm_widget * snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, const struct snd_soc_dapm_widget *widget) @@ -3570,6 +3556,29 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, return ERR_PTR(ret); } +/** + * snd_soc_dapm_new_control - create new dapm control + * @dapm: DAPM context + * @widget: widget template + * + * Creates new DAPM control based upon a template. + * + * Returns a widget pointer on success or an error pointer on failure + */ +struct snd_soc_dapm_widget * +snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, + const struct snd_soc_dapm_widget *widget) +{ + struct snd_soc_dapm_widget *w; + + mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); + w = snd_soc_dapm_new_control_unlocked(dapm, widget); + mutex_unlock(&dapm->card->dapm_mutex); + + return w; +} +EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control); + /** * snd_soc_dapm_new_controls - create new dapm controls * @dapm: DAPM context -- 2.19.0.rc1

1 0

[alsa-devel] [PATCH v2 1/5] ASoC: dapm: Move error handling to snd_soc_dapm_new_control_unlocked
by Charles Keepax 06 Sep '18

06 Sep '18

Currently DAPM has a lot of similar code to handle errors from snd_soc_dapm_new_control_unlocked, and much of this code does not really accurately reflect what the function returns. Firstly, most places will check for a return value of -EPROBE_DEFER and silence any error messages in that case. The one notable exception here being dapm_kcontrol_data_alloc which does currently print any error messages in the case of snd_soc_dapm_new_control_unlocked returning NULL or an error. Additionally the error prints being silenced in these case are redundant as snd_soc_dapm_new_control_unlocked can only return -EPROBE_DEFER or NULL when failing. Secondly, most places will treat a return value of NULL as an -ENOMEM. This is not correct either since any error except EPROBE_DEFER will cause a return value of NULL from snd_soc_dapm_new_control_unlocked. Centralise this handling and the error messages within snd_soc_dapm_new_control_unlocked and update the callers to simply check IS_ERR and return. Note that this update is slightly simpler in the case of dapm_kcontrol_data_alloc where that is fairly close to the handling that was already in place. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- Changes since v1: - Improved the commit message to be a more descriptive of the change Thanks, Charles sound/soc/soc-dapm.c | 118 ++++++++--------------------------------------- sound/soc/soc-topology.c | 11 ----- 2 files changed, 19 insertions(+), 110 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 0a738cb439be..d13a25ce1275 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -364,10 +364,6 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, ret = PTR_ERR(data->widget); goto err_data; } - if (!data->widget) { - ret = -ENOMEM; - goto err_data; - } } break; case snd_soc_dapm_demux: @@ -402,10 +398,6 @@ static int dapm_kcontrol_data_alloc(struct snd_soc_dapm_widget *widget, ret = PTR_ERR(data->widget); goto err_data; } - if (!data->widget) { - ret = -ENOMEM; - goto err_data; - } snd_soc_dapm_add_path(widget->dapm, data->widget, widget, NULL, NULL); @@ -3433,23 +3425,8 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME); w = snd_soc_dapm_new_control_unlocked(dapm, widget); - /* Do not nag about probe deferrals */ - if (IS_ERR(w)) { - int ret = PTR_ERR(w); - - if (ret != -EPROBE_DEFER) - dev_err(dapm->dev, - "ASoC: Failed to create DAPM control %s (%d)\n", - widget->name, ret); - goto out_unlock; - } - if (!w) - dev_err(dapm->dev, - "ASoC: Failed to create DAPM control %s\n", - widget->name); - -out_unlock: mutex_unlock(&dapm->card->dapm_mutex); + return w; } EXPORT_SYMBOL_GPL(snd_soc_dapm_new_control); @@ -3464,24 +3441,20 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, int ret; if ((w = dapm_cnew_widget(widget)) == NULL) - return NULL; + return ERR_PTR(-ENOMEM); switch (w->id) { case snd_soc_dapm_regulator_supply: w->regulator = devm_regulator_get(dapm->dev, w->name); if (IS_ERR(w->regulator)) { ret = PTR_ERR(w->regulator); - if (ret == -EPROBE_DEFER) - return ERR_PTR(ret); - dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", - w->name, ret); - return NULL; + goto request_failed; } if (w->on_val & SND_SOC_DAPM_REGULATOR_BYPASS) { ret = regulator_allow_bypass(w->regulator, true); if (ret != 0) - dev_warn(w->dapm->dev, + dev_warn(dapm->dev, "ASoC: Failed to bypass %s: %d\n", w->name, ret); } @@ -3490,22 +3463,14 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, w->pinctrl = devm_pinctrl_get(dapm->dev); if (IS_ERR(w->pinctrl)) { ret = PTR_ERR(w->pinctrl); - if (ret == -EPROBE_DEFER) - return ERR_PTR(ret); - dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", - w->name, ret); - return NULL; + goto request_failed; } break; case snd_soc_dapm_clock_supply: w->clk = devm_clk_get(dapm->dev, w->name); if (IS_ERR(w->clk)) { ret = PTR_ERR(w->clk); - if (ret == -EPROBE_DEFER) - return ERR_PTR(ret); - dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", - w->name, ret); - return NULL; + goto request_failed; } break; default: @@ -3519,7 +3484,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, w->name = kstrdup_const(widget->name, GFP_KERNEL); if (w->name == NULL) { kfree(w); - return NULL; + return ERR_PTR(-ENOMEM); } switch (w->id) { @@ -3596,6 +3561,13 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, /* machine layer sets up unconnected pins and insertions */ w->connected = 1; return w; + +request_failed: + if (ret != -EPROBE_DEFER) + dev_err(dapm->dev, "ASoC: Failed to request %s: %d\n", + w->name, ret); + + return ERR_PTR(ret); } /** @@ -3621,19 +3593,6 @@ int snd_soc_dapm_new_controls(struct snd_soc_dapm_context *dapm, w = snd_soc_dapm_new_control_unlocked(dapm, widget); if (IS_ERR(w)) { ret = PTR_ERR(w); - /* Do not nag about probe deferrals */ - if (ret == -EPROBE_DEFER) - break; - dev_err(dapm->dev, - "ASoC: Failed to create DAPM control %s (%d)\n", - widget->name, ret); - break; - } - if (!w) { - dev_err(dapm->dev, - "ASoC: Failed to create DAPM control %s\n", - widget->name); - ret = -ENOMEM; break; } widget++; @@ -3944,21 +3903,8 @@ int snd_soc_dapm_new_pcm(struct snd_soc_card *card, dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name); w = snd_soc_dapm_new_control_unlocked(&card->dapm, &template); - if (IS_ERR(w)) { - ret = PTR_ERR(w); - /* Do not nag about probe deferrals */ - if (ret != -EPROBE_DEFER) - dev_err(card->dev, - "ASoC: Failed to create %s widget (%d)\n", - link_name, ret); - goto outfree_kcontrol_news; - } - if (!w) { - dev_err(card->dev, "ASoC: Failed to create %s widget\n", - link_name); - ret = -ENOMEM; + if (IS_ERR(w)) goto outfree_kcontrol_news; - } w->params = params; w->num_params = num_params; @@ -3999,21 +3945,8 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, template.name); w = snd_soc_dapm_new_control_unlocked(dapm, &template); - if (IS_ERR(w)) { - int ret = PTR_ERR(w); - - /* Do not nag about probe deferrals */ - if (ret != -EPROBE_DEFER) - dev_err(dapm->dev, - "ASoC: Failed to create %s widget (%d)\n", - dai->driver->playback.stream_name, ret); - return ret; - } - if (!w) { - dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", - dai->driver->playback.stream_name); - return -ENOMEM; - } + if (IS_ERR(w)) + return PTR_ERR(w); w->priv = dai; dai->playback_widget = w; @@ -4028,21 +3961,8 @@ int snd_soc_dapm_new_dai_widgets(struct snd_soc_dapm_context *dapm, template.name); w = snd_soc_dapm_new_control_unlocked(dapm, &template); - if (IS_ERR(w)) { - int ret = PTR_ERR(w); - - /* Do not nag about probe deferrals */ - if (ret != -EPROBE_DEFER) - dev_err(dapm->dev, - "ASoC: Failed to create %s widget (%d)\n", - dai->driver->playback.stream_name, ret); - return ret; - } - if (!w) { - dev_err(dapm->dev, "ASoC: Failed to create %s widget\n", - dai->driver->capture.stream_name); - return -ENOMEM; - } + if (IS_ERR(w)) + return PTR_ERR(w); w->priv = dai; dai->capture_widget = w; diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 66e77e020745..17f81b9a5754 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1565,17 +1565,6 @@ static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, widget = snd_soc_dapm_new_control_unlocked(dapm, &template); if (IS_ERR(widget)) { ret = PTR_ERR(widget); - /* Do not nag about probe deferrals */ - if (ret != -EPROBE_DEFER) - dev_err(tplg->dev, - "ASoC: failed to create widget %s controls (%d)\n", - w->name, ret); - goto hdr_err; - } - if (widget == NULL) { - dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n", - w->name); - ret = -ENOMEM; goto hdr_err; } -- 2.11.0

2 5

[alsa-devel] Applied "ASoC: dapm: Add support for multi-CODEC CODEC to CODEC links" to the asoc tree
by Mark Brown 06 Sep '18

06 Sep '18

The patch ASoC: dapm: Add support for multi-CODEC CODEC to CODEC links has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 4a75aae17b2a802a7267206414050408392c374c Mon Sep 17 00:00:00 2001 From: Charles Keepax <ckeepax(a)opensource.cirrus.com> Date: Wed, 5 Sep 2018 15:21:01 +0100 Subject: [PATCH] ASoC: dapm: Add support for multi-CODEC CODEC to CODEC links Currently multi-CODEC is not supported on CODEC to CODEC links. There are common applications where this would be useful, such as connecting two mono amplifiers to an audio CODEC. Adding support simply requires an update of snd_soc_dai_link_event to loop over the attached CODEC DAIs. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-dapm.c | 123 ++++++++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 53 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index bbfcb7fc05cc..40f27c95da61 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3614,7 +3614,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_new_controls); static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { - struct snd_soc_dapm_path *source_p, *sink_p; + struct snd_soc_dapm_path *path; struct snd_soc_dai *source, *sink; struct snd_soc_pcm_runtime *rtd = w->priv; const struct snd_soc_pcm_stream *config = w->params + w->params_select; @@ -3629,17 +3629,6 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, list_empty(&w->edges[SND_SOC_DAPM_DIR_IN]))) return -EINVAL; - /* We only support a single source and sink, pick the first */ - source_p = list_first_entry(&w->edges[SND_SOC_DAPM_DIR_OUT], - struct snd_soc_dapm_path, - list_node[SND_SOC_DAPM_DIR_OUT]); - sink_p = list_first_entry(&w->edges[SND_SOC_DAPM_DIR_IN], - struct snd_soc_dapm_path, - list_node[SND_SOC_DAPM_DIR_IN]); - - source = source_p->source->priv; - sink = sink_p->sink->priv; - /* Be a little careful as we don't want to overflow the mask array */ if (config->formats) { fmt = ffs(config->formats) - 1; @@ -3681,59 +3670,90 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_PRE_PMU: substream.stream = SNDRV_PCM_STREAM_CAPTURE; - if (source->driver->ops->startup) { - ret = source->driver->ops->startup(&substream, source); - if (ret < 0) { - dev_err(source->dev, - "ASoC: startup() failed: %d\n", ret); - goto out; + snd_soc_dapm_widget_for_each_source_path(w, path) { + source = path->source->priv; + + if (source->driver->ops->startup) { + ret = source->driver->ops->startup(&substream, + source); + if (ret < 0) { + dev_err(source->dev, + "ASoC: startup() failed: %d\n", + ret); + goto out; + } + source->active++; } - source->active++; + ret = soc_dai_hw_params(&substream, params, source); + if (ret < 0) + goto out; } - ret = soc_dai_hw_params(&substream, params, source); - if (ret < 0) - goto out; substream.stream = SNDRV_PCM_STREAM_PLAYBACK; - if (sink->driver->ops->startup) { - ret = sink->driver->ops->startup(&substream, sink); - if (ret < 0) { - dev_err(sink->dev, - "ASoC: startup() failed: %d\n", ret); - goto out; + snd_soc_dapm_widget_for_each_sink_path(w, path) { + sink = path->sink->priv; + + if (sink->driver->ops->startup) { + ret = sink->driver->ops->startup(&substream, + sink); + if (ret < 0) { + dev_err(sink->dev, + "ASoC: startup() failed: %d\n", + ret); + goto out; + } + sink->active++; } - sink->active++; + ret = soc_dai_hw_params(&substream, params, sink); + if (ret < 0) + goto out; } - ret = soc_dai_hw_params(&substream, params, sink); - if (ret < 0) - goto out; break; case SND_SOC_DAPM_POST_PMU: - ret = snd_soc_dai_digital_mute(sink, 0, - SNDRV_PCM_STREAM_PLAYBACK); - if (ret != 0 && ret != -ENOTSUPP) - dev_warn(sink->dev, "ASoC: Failed to unmute: %d\n", ret); - ret = 0; + snd_soc_dapm_widget_for_each_sink_path(w, path) { + sink = path->sink->priv; + + ret = snd_soc_dai_digital_mute(sink, 0, + SNDRV_PCM_STREAM_PLAYBACK); + if (ret != 0 && ret != -ENOTSUPP) + dev_warn(sink->dev, + "ASoC: Failed to unmute: %d\n", ret); + ret = 0; + } break; case SND_SOC_DAPM_PRE_PMD: - ret = snd_soc_dai_digital_mute(sink, 1, - SNDRV_PCM_STREAM_PLAYBACK); - if (ret != 0 && ret != -ENOTSUPP) - dev_warn(sink->dev, "ASoC: Failed to mute: %d\n", ret); - ret = 0; + snd_soc_dapm_widget_for_each_sink_path(w, path) { + sink = path->sink->priv; + + ret = snd_soc_dai_digital_mute(sink, 1, + SNDRV_PCM_STREAM_PLAYBACK); + if (ret != 0 && ret != -ENOTSUPP) + dev_warn(sink->dev, + "ASoC: Failed to mute: %d\n", ret); + ret = 0; + } + + snd_soc_dapm_widget_for_each_source_path(w, path) { + source = path->source->priv; - source->active--; - if (source->driver->ops->shutdown) { - substream.stream = SNDRV_PCM_STREAM_CAPTURE; - source->driver->ops->shutdown(&substream, source); + source->active--; + if (source->driver->ops->shutdown) { + substream.stream = SNDRV_PCM_STREAM_CAPTURE; + source->driver->ops->shutdown(&substream, + source); + } } - sink->active--; - if (sink->driver->ops->shutdown) { - substream.stream = SNDRV_PCM_STREAM_PLAYBACK; - sink->driver->ops->shutdown(&substream, sink); + snd_soc_dapm_widget_for_each_sink_path(w, path) { + sink = path->sink->priv; + + sink->active--; + if (sink->driver->ops->shutdown) { + substream.stream = SNDRV_PCM_STREAM_PLAYBACK; + sink->driver->ops->shutdown(&substream, sink); + } } break; @@ -4043,9 +4063,6 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card, int i; if (rtd->dai_link->params) { - if (rtd->num_codecs > 1) - dev_warn(card->dev, "ASoC: Multiple codecs not supported yet\n"); - playback_cpu = cpu_dai->capture_widget; capture_cpu = cpu_dai->playback_widget; } else { -- 2.19.0.rc1

1 0

[alsa-devel] Applied "ASoC: dapm: Move CODEC to CODEC params from the widget to the runtime" to the asoc tree
by Mark Brown 06 Sep '18

06 Sep '18

The patch ASoC: dapm: Move CODEC to CODEC params from the widget to the runtime has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 243bcfafcd9a23a20867fd488dc3a35264918d87 Mon Sep 17 00:00:00 2001 From: Charles Keepax <ckeepax(a)opensource.cirrus.com> Date: Wed, 5 Sep 2018 15:21:02 +0100 Subject: [PATCH] ASoC: dapm: Move CODEC to CODEC params from the widget to the runtime Larger CODECs may contain many several hundred widgets and which set of parameters is selected only needs to be recorded on a per DAI basis. As such move the selected CODEC to CODEC link params to be stored in the runtime rather than the DAPM widget, to save some memory. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- include/sound/soc-dapm.h | 3 --- include/sound/soc.h | 2 ++ sound/soc/soc-dapm.c | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index cb177fa21ce7..bd8163f151cb 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -584,9 +584,6 @@ struct snd_soc_dapm_widget { void *priv; /* widget specific data */ struct regulator *regulator; /* attached regulator */ struct pinctrl *pinctrl; /* attached pinctrl */ - const struct snd_soc_pcm_stream *params; /* params for dai links */ - unsigned int num_params; /* number of params for dai links */ - unsigned int params_select; /* currently selected param for dai link */ /* dapm control */ int reg; /* negative reg = no direct dapm */ diff --git a/include/sound/soc.h b/include/sound/soc.h index 6b68b31e3140..821bf99992b8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1130,6 +1130,8 @@ struct snd_soc_pcm_runtime { enum snd_soc_pcm_subclass pcm_subclass; struct snd_pcm_ops ops; + unsigned int params_select; /* currently selected param for dai link */ + /* Dynamic PCM BE runtime data */ struct snd_soc_dpcm_runtime dpcm[2]; int fe_compr; diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 40f27c95da61..9f4edcd19e02 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -1018,9 +1018,10 @@ static int dapm_new_dai_link(struct snd_soc_dapm_widget *w) struct snd_kcontrol *kcontrol; struct snd_soc_dapm_context *dapm = w->dapm; struct snd_card *card = dapm->card->snd_card; + struct snd_soc_pcm_runtime *rtd = w->priv; /* create control for links with > 1 config */ - if (w->num_params <= 1) + if (rtd->dai_link->num_params <= 1) return 0; /* add kcontrol */ @@ -3617,13 +3618,15 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, struct snd_soc_dapm_path *path; struct snd_soc_dai *source, *sink; struct snd_soc_pcm_runtime *rtd = w->priv; - const struct snd_soc_pcm_stream *config = w->params + w->params_select; + const struct snd_soc_pcm_stream *config; struct snd_pcm_substream substream; struct snd_pcm_hw_params *params = NULL; struct snd_pcm_runtime *runtime = NULL; unsigned int fmt; int ret; + config = rtd->dai_link->params + rtd->params_select; + if (WARN_ON(!config) || WARN_ON(list_empty(&w->edges[SND_SOC_DAPM_DIR_OUT]) || list_empty(&w->edges[SND_SOC_DAPM_DIR_IN]))) @@ -3772,8 +3775,9 @@ static int snd_soc_dapm_dai_link_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_dapm_widget *w = snd_kcontrol_chip(kcontrol); + struct snd_soc_pcm_runtime *rtd = w->priv; - ucontrol->value.enumerated.item[0] = w->params_select; + ucontrol->value.enumerated.item[0] = rtd->params_select; return 0; } @@ -3782,18 +3786,19 @@ static int snd_soc_dapm_dai_link_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct snd_soc_dapm_widget *w = snd_kcontrol_chip(kcontrol); + struct snd_soc_pcm_runtime *rtd = w->priv; /* Can't change the config when widget is already powered */ if (w->power) return -EBUSY; - if (ucontrol->value.enumerated.item[0] == w->params_select) + if (ucontrol->value.enumerated.item[0] == rtd->params_select) return 0; - if (ucontrol->value.enumerated.item[0] >= w->num_params) + if (ucontrol->value.enumerated.item[0] >= rtd->dai_link->num_params) return -EINVAL; - w->params_select = ucontrol->value.enumerated.item[0]; + rtd->params_select = ucontrol->value.enumerated.item[0]; return 0; } @@ -3936,8 +3941,6 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd, if (IS_ERR(w)) goto outfree_kcontrol_news; - w->params = rtd->dai_link->params; - w->num_params = rtd->dai_link->num_params; w->priv = rtd; return w; -- 2.19.0.rc1

1 0

[alsa-devel] [PATCH] ASoC: hdac_hdmi: remove redundant check for !port condition
by Colin King 06 Sep '18

06 Sep '18

From: Colin Ian King <colin.king(a)canonical.com> The !port check is redundant as it being performed in the following check. Remove it. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/hdac_hdmi.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 7b8533abf637..dc6a0dfea050 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1961,9 +1961,6 @@ static int hdac_hdmi_get_spk_alloc(struct hdac_device *hdev, int pcm_idx) port = list_first_entry(&pcm->port_list, struct hdac_hdmi_port, head); - if (!port) - return 0; - if (!port || !port->eld.eld_valid) return 0; -- 2.17.1

2 1