tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: SDCA: Add missing function type names

It is not helpful to error out on some SDCA function types, we
might as well report the correct name and let the driver core
simply not bind a driver to those functions for which the code
lacks support. Also given no functions currently have support,
it seems odd to select some as unsupported.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20241220173516.907406-4-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Charles Keepax and committed by
Mark Brown c1ed5eb1 c36297b1

+11 -2
+1
include/sound/sdca_function.h
··· 42 42 #define SDCA_FUNCTION_TYPE_RJ_NAME "RJ" 43 43 #define SDCA_FUNCTION_TYPE_SIMPLE_NAME "SimpleJack" 44 44 #define SDCA_FUNCTION_TYPE_HID_NAME "HID" 45 + #define SDCA_FUNCTION_TYPE_IMP_DEF_NAME "ImplementationDefined" 45 46 46 47 enum sdca_entity0_controls { 47 48 SDCA_CONTROL_ENTITY_0_COMMIT_GROUP_MASK = 0x01,
+10 -2
sound/soc/sdca/sdca_functions.c
··· 75 75 *function_name = SDCA_FUNCTION_TYPE_HID_NAME; 76 76 break; 77 77 case SDCA_FUNCTION_TYPE_SIMPLE_AMP: 78 + *function_name = SDCA_FUNCTION_TYPE_SIMPLE_AMP_NAME; 79 + break; 78 80 case SDCA_FUNCTION_TYPE_SIMPLE_MIC: 81 + *function_name = SDCA_FUNCTION_TYPE_SIMPLE_MIC_NAME; 82 + break; 79 83 case SDCA_FUNCTION_TYPE_SPEAKER_MIC: 84 + *function_name = SDCA_FUNCTION_TYPE_SPEAKER_MIC_NAME; 85 + break; 80 86 case SDCA_FUNCTION_TYPE_RJ: 87 + *function_name = SDCA_FUNCTION_TYPE_RJ_NAME; 88 + break; 81 89 case SDCA_FUNCTION_TYPE_IMP_DEF: 82 - dev_warn(dev, "unsupported SDCA function type %d\n", *function_type); 83 - return -EINVAL; 90 + *function_name = SDCA_FUNCTION_TYPE_IMP_DEF_NAME; 91 + break; 84 92 default: 85 93 dev_err(dev, "invalid SDCA function type %d\n", *function_type); 86 94 return -EINVAL;