diff options
author | Jonathan Corbet <corbet@lwn.net> | 2015-08-25 03:14:48 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-28 14:07:16 -0400 |
commit | 628536ea0627e71da654bd34b1942c85832dbdba (patch) | |
tree | 090475fe2bd567c13c049a48bb466f2a99d7dca5 | |
parent | 7d1442b4c4142d94a83451d4e7a11db8aee132ab (diff) |
ASoC: Clean up docbook warnings
A number of functions and structures in the sound subsystem had incomplete
and/or obsolete DocBook comments, leading to warnings when the docs were
built. Correct those comments so that we can enjoy our audio in the
absence of warning noise.
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | Documentation/DocBook/alsa-driver-api.tmpl | 2 | ||||
-rw-r--r-- | include/sound/soc.h | 11 | ||||
-rw-r--r-- | sound/soc/soc-core.c | 13 | ||||
-rw-r--r-- | sound/soc/soc-dapm.c | 2 |
4 files changed, 18 insertions, 10 deletions
diff --git a/Documentation/DocBook/alsa-driver-api.tmpl b/Documentation/DocBook/alsa-driver-api.tmpl index 71f9246127ec..e94a10bb4a9e 100644 --- a/Documentation/DocBook/alsa-driver-api.tmpl +++ b/Documentation/DocBook/alsa-driver-api.tmpl | |||
@@ -108,7 +108,7 @@ | |||
108 | <sect1><title>ASoC Core API</title> | 108 | <sect1><title>ASoC Core API</title> |
109 | !Iinclude/sound/soc.h | 109 | !Iinclude/sound/soc.h |
110 | !Esound/soc/soc-core.c | 110 | !Esound/soc/soc-core.c |
111 | !Esound/soc/soc-cache.c | 111 | <!-- !Esound/soc/soc-cache.c no docbook comments here --> |
112 | !Esound/soc/soc-devres.c | 112 | !Esound/soc/soc-devres.c |
113 | !Esound/soc/soc-io.c | 113 | !Esound/soc/soc-io.c |
114 | !Esound/soc/soc-pcm.c | 114 | !Esound/soc/soc-pcm.c |
diff --git a/include/sound/soc.h b/include/sound/soc.h index 93df8bf9d54a..4537e81eeeda 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h | |||
@@ -619,6 +619,7 @@ int snd_soc_put_strobe(struct snd_kcontrol *kcontrol, | |||
619 | * @pin: name of the pin to update | 619 | * @pin: name of the pin to update |
620 | * @mask: bits to check for in reported jack status | 620 | * @mask: bits to check for in reported jack status |
621 | * @invert: if non-zero then pin is enabled when status is not reported | 621 | * @invert: if non-zero then pin is enabled when status is not reported |
622 | * @list: internal list entry | ||
622 | */ | 623 | */ |
623 | struct snd_soc_jack_pin { | 624 | struct snd_soc_jack_pin { |
624 | struct list_head list; | 625 | struct list_head list; |
@@ -635,7 +636,7 @@ struct snd_soc_jack_pin { | |||
635 | * @jack_type: type of jack that is expected for this voltage | 636 | * @jack_type: type of jack that is expected for this voltage |
636 | * @debounce_time: debounce_time for jack, codec driver should wait for this | 637 | * @debounce_time: debounce_time for jack, codec driver should wait for this |
637 | * duration before reading the adc for voltages | 638 | * duration before reading the adc for voltages |
638 | * @:list: list container | 639 | * @list: internal list entry |
639 | */ | 640 | */ |
640 | struct snd_soc_jack_zone { | 641 | struct snd_soc_jack_zone { |
641 | unsigned int min_mv; | 642 | unsigned int min_mv; |
@@ -651,12 +652,12 @@ struct snd_soc_jack_zone { | |||
651 | * @gpio: legacy gpio number | 652 | * @gpio: legacy gpio number |
652 | * @idx: gpio descriptor index within the function of the GPIO | 653 | * @idx: gpio descriptor index within the function of the GPIO |
653 | * consumer device | 654 | * consumer device |
654 | * @gpiod_dev GPIO consumer device | 655 | * @gpiod_dev: GPIO consumer device |
655 | * @name: gpio name. Also as connection ID for the GPIO consumer | 656 | * @name: gpio name. Also as connection ID for the GPIO consumer |
656 | * device function name lookup | 657 | * device function name lookup |
657 | * @report: value to report when jack detected | 658 | * @report: value to report when jack detected |
658 | * @invert: report presence in low state | 659 | * @invert: report presence in low state |
659 | * @debouce_time: debouce time in ms | 660 | * @debounce_time: debounce time in ms |
660 | * @wake: enable as wake source | 661 | * @wake: enable as wake source |
661 | * @jack_status_check: callback function which overrides the detection | 662 | * @jack_status_check: callback function which overrides the detection |
662 | * to provide more complex checks (eg, reading an | 663 | * to provide more complex checks (eg, reading an |
@@ -672,11 +673,13 @@ struct snd_soc_jack_gpio { | |||
672 | int debounce_time; | 673 | int debounce_time; |
673 | bool wake; | 674 | bool wake; |
674 | 675 | ||
676 | /* private: */ | ||
675 | struct snd_soc_jack *jack; | 677 | struct snd_soc_jack *jack; |
676 | struct delayed_work work; | 678 | struct delayed_work work; |
677 | struct gpio_desc *desc; | 679 | struct gpio_desc *desc; |
678 | 680 | ||
679 | void *data; | 681 | void *data; |
682 | /* public: */ | ||
680 | int (*jack_status_check)(void *data); | 683 | int (*jack_status_check)(void *data); |
681 | }; | 684 | }; |
682 | 685 | ||
@@ -1319,7 +1322,7 @@ static inline struct snd_soc_dapm_context *snd_soc_codec_get_dapm( | |||
1319 | 1322 | ||
1320 | /** | 1323 | /** |
1321 | * snd_soc_dapm_init_bias_level() - Initialize CODEC DAPM bias level | 1324 | * snd_soc_dapm_init_bias_level() - Initialize CODEC DAPM bias level |
1322 | * @dapm: The CODEC for which to initialize the DAPM bias level | 1325 | * @codec: The CODEC for which to initialize the DAPM bias level |
1323 | * @level: The DAPM level to initialize to | 1326 | * @level: The DAPM level to initialize to |
1324 | * | 1327 | * |
1325 | * Initializes the CODEC DAPM bias level. See snd_soc_dapm_init_bias_level(). | 1328 | * Initializes the CODEC DAPM bias level. See snd_soc_dapm_init_bias_level(). |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 90d6335de17a..32242512d828 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
@@ -2798,6 +2798,7 @@ EXPORT_SYMBOL_GPL(snd_soc_register_component); | |||
2798 | /** | 2798 | /** |
2799 | * snd_soc_unregister_component - Unregister a component from the ASoC core | 2799 | * snd_soc_unregister_component - Unregister a component from the ASoC core |
2800 | * | 2800 | * |
2801 | * @dev: The device to unregister | ||
2801 | */ | 2802 | */ |
2802 | void snd_soc_unregister_component(struct device *dev) | 2803 | void snd_soc_unregister_component(struct device *dev) |
2803 | { | 2804 | { |
@@ -2877,7 +2878,8 @@ EXPORT_SYMBOL_GPL(snd_soc_add_platform); | |||
2877 | /** | 2878 | /** |
2878 | * snd_soc_register_platform - Register a platform with the ASoC core | 2879 | * snd_soc_register_platform - Register a platform with the ASoC core |
2879 | * | 2880 | * |
2880 | * @platform: platform to register | 2881 | * @dev: The device for the platform |
2882 | * @platform_drv: The driver for the platform | ||
2881 | */ | 2883 | */ |
2882 | int snd_soc_register_platform(struct device *dev, | 2884 | int snd_soc_register_platform(struct device *dev, |
2883 | const struct snd_soc_platform_driver *platform_drv) | 2885 | const struct snd_soc_platform_driver *platform_drv) |
@@ -2938,7 +2940,7 @@ EXPORT_SYMBOL_GPL(snd_soc_lookup_platform); | |||
2938 | /** | 2940 | /** |
2939 | * snd_soc_unregister_platform - Unregister a platform from the ASoC core | 2941 | * snd_soc_unregister_platform - Unregister a platform from the ASoC core |
2940 | * | 2942 | * |
2941 | * @platform: platform to unregister | 2943 | * @dev: platform to unregister |
2942 | */ | 2944 | */ |
2943 | void snd_soc_unregister_platform(struct device *dev) | 2945 | void snd_soc_unregister_platform(struct device *dev) |
2944 | { | 2946 | { |
@@ -3029,7 +3031,10 @@ static int snd_soc_codec_set_bias_level(struct snd_soc_dapm_context *dapm, | |||
3029 | /** | 3031 | /** |
3030 | * snd_soc_register_codec - Register a codec with the ASoC core | 3032 | * snd_soc_register_codec - Register a codec with the ASoC core |
3031 | * | 3033 | * |
3032 | * @codec: codec to register | 3034 | * @dev: The parent device for this codec |
3035 | * @codec_drv: Codec driver | ||
3036 | * @dai_drv: The associated DAI driver | ||
3037 | * @num_dai: Number of DAIs | ||
3033 | */ | 3038 | */ |
3034 | int snd_soc_register_codec(struct device *dev, | 3039 | int snd_soc_register_codec(struct device *dev, |
3035 | const struct snd_soc_codec_driver *codec_drv, | 3040 | const struct snd_soc_codec_driver *codec_drv, |
@@ -3128,7 +3133,7 @@ EXPORT_SYMBOL_GPL(snd_soc_register_codec); | |||
3128 | /** | 3133 | /** |
3129 | * snd_soc_unregister_codec - Unregister a codec from the ASoC core | 3134 | * snd_soc_unregister_codec - Unregister a codec from the ASoC core |
3130 | * | 3135 | * |
3131 | * @codec: codec to unregister | 3136 | * @dev: codec to unregister |
3132 | */ | 3137 | */ |
3133 | void snd_soc_unregister_codec(struct device *dev) | 3138 | void snd_soc_unregister_codec(struct device *dev) |
3134 | { | 3139 | { |
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index aa327c92480c..c4e3720bea41 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -2911,7 +2911,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_weak_routes); | |||
2911 | 2911 | ||
2912 | /** | 2912 | /** |
2913 | * snd_soc_dapm_new_widgets - add new dapm widgets | 2913 | * snd_soc_dapm_new_widgets - add new dapm widgets |
2914 | * @dapm: DAPM context | 2914 | * @card: card to be checked for new dapm widgets |
2915 | * | 2915 | * |
2916 | * Checks the codec for any new dapm widgets and creates them if found. | 2916 | * Checks the codec for any new dapm widgets and creates them if found. |
2917 | * | 2917 | * |