| From cb2ed70129285ad3a10c51e634b60b558eaac824 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 6 Jan 2026 10:59:51 -0800 |
| Subject: ALSA: hda - fix function names & missing function parameter |
| |
| From: Randy Dunlap <rdunlap@infradead.org> |
| |
| [ Upstream commit b47ce586300b3c2b6650f4c7ac5c0f59c6bf6f4b ] |
| |
| Use the correct function names and add a function parameter description |
| to avoid kernel-doc warnings: |
| |
| hda_jack.h:97: warning: Function parameter or struct member 'cb' not |
| described in 'snd_hda_jack_detect_enable_callback' |
| hda_jack.h:97: warning: expecting prototype for snd_hda_jack_detect_enable(). |
| Prototype was for snd_hda_jack_detect_enable_callback() instead |
| hda_local.h:441: warning: expecting prototype for _snd_hda_set_pin_ctl(). |
| Prototype was for snd_hda_set_pin_ctl() instead |
| |
| Fixes: cdd03cedc5b5 ("ALSA: hda - Introduce snd_hda_set_pin_ctl*() helper functions") |
| Fixes: 5204a05d70d9 ("ALSA: hda - Add DP-MST jack support") |
| Signed-off-by: Randy Dunlap <rdunlap@infradead.org> |
| Link: https://patch.msgid.link/20260106185951.2179242-1-rdunlap@infradead.org |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/hda/common/hda_jack.h | 4 ++-- |
| sound/hda/common/hda_local.h | 2 +- |
| 2 files changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/sound/hda/common/hda_jack.h b/sound/hda/common/hda_jack.h |
| index ff7d289c034bf..e9b9970c59ed4 100644 |
| --- a/sound/hda/common/hda_jack.h |
| +++ b/sound/hda/common/hda_jack.h |
| @@ -82,10 +82,10 @@ snd_hda_jack_detect_enable_callback_mst(struct hda_codec *codec, hda_nid_t nid, |
| int dev_id, hda_jack_callback_fn func); |
| |
| /** |
| - * snd_hda_jack_detect_enable - enable the jack-detection |
| + * snd_hda_jack_detect_enable_callback - enable the jack-detection |
| * @codec: the HDA codec |
| * @nid: pin NID to enable |
| - * @func: callback function to register |
| + * @cb: callback function to register |
| * |
| * In the case of error, the return value will be a pointer embedded with |
| * errno. Check and handle the return value appropriately with standard |
| diff --git a/sound/hda/common/hda_local.h b/sound/hda/common/hda_local.h |
| index a7e53277a0fea..ab423f1cef549 100644 |
| --- a/sound/hda/common/hda_local.h |
| +++ b/sound/hda/common/hda_local.h |
| @@ -424,7 +424,7 @@ int _snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin, |
| unsigned int val, bool cached); |
| |
| /** |
| - * _snd_hda_set_pin_ctl - Set a pin-control value safely |
| + * snd_hda_set_pin_ctl - Set a pin-control value safely |
| * @codec: the codec instance |
| * @pin: the pin NID to set the control |
| * @val: the pin-control value (AC_PINCTL_* bits) |
| -- |
| 2.51.0 |
| |