ASoC: codecs: wcd-mbhc: Constify passed MBHC reg fields

The wcd-mbhc-v2 helper code/module does not modify passed array of
registry fields, thus it can be made const for code safety.  It will
also allow individual drivers to allocate the array in rodata.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20240612-asoc-wcd9xxx-wide-cleanups-v1-1-0d15885b2a06@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wcd-mbhc-v2.c b/sound/soc/codecs/wcd-mbhc-v2.c
index 0e6218ed0e5e013882a3d77b26c8f120ee3bad0f..d589a212b7688d6e75a13f526649d6ed551ca054 100644 (file)
--- a/sound/soc/codecs/wcd-mbhc-v2.c
+++ b/sound/soc/codecs/wcd-mbhc-v2.c
@@ -50,7 +50,7 @@ struct wcd_mbhc {
        struct wcd_mbhc_config *cfg;
        const struct wcd_mbhc_cb *mbhc_cb;
        const struct wcd_mbhc_intr *intr_ids;
-       struct wcd_mbhc_field *fields;
+       const struct wcd_mbhc_field *fields;
        /* Delayed work to report long button press */
        struct delayed_work mbhc_btn_dwork;
        /* Work to handle plug report */
@@ -1505,7 +1505,7 @@ EXPORT_SYMBOL(wcd_dt_parse_mbhc_data);
 struct wcd_mbhc *wcd_mbhc_init(struct snd_soc_component *component,
                               const struct wcd_mbhc_cb *mbhc_cb,
                               const struct wcd_mbhc_intr *intr_ids,
-                              struct wcd_mbhc_field *fields,
+                              const struct wcd_mbhc_field *fields,
                               bool impedance_det_en)
 {
        struct device *dev = component->dev;

diff --git a/sound/soc/codecs/wcd-mbhc-v2.h b/sound/soc/codecs/wcd-mbhc-v2.h
index df68e99c81a33766591ccfda5a31303715db2ab4..b977e8f87d7cb733d23ed0c3301896add30d394b 100644 (file)
--- a/sound/soc/codecs/wcd-mbhc-v2.h
+++ b/sound/soc/codecs/wcd-mbhc-v2.h
@@ -279,7 +279,7 @@ int wcd_mbhc_typec_report_unplug(struct wcd_mbhc *mbhc);
 struct wcd_mbhc *wcd_mbhc_init(struct snd_soc_component *component,
                      const struct wcd_mbhc_cb *mbhc_cb,
                      const struct wcd_mbhc_intr *mbhc_cdc_intr_ids,
-                     struct wcd_mbhc_field *fields,
+                     const struct wcd_mbhc_field *fields,
                      bool impedance_det_en);
 int wcd_mbhc_get_impedance(struct wcd_mbhc *mbhc, uint32_t *zl,
                           uint32_t *zr);
@@ -300,7 +300,7 @@ static inline void wcd_mbhc_stop(struct wcd_mbhc *mbhc)
 static inline struct wcd_mbhc *wcd_mbhc_init(struct snd_soc_component *component,
                      const struct wcd_mbhc_cb *mbhc_cb,
                      const struct wcd_mbhc_intr *mbhc_cdc_intr_ids,
-                     struct wcd_mbhc_field *fields,
+                     const struct wcd_mbhc_field *fields,
                      bool impedance_det_en)
 {
        return ERR_PTR(-ENOTSUPP);