ASoC: wm_adsp: Remove use of snd_ctl_elem_type_t

In preparation for moving the generic DSP support out of ASoC, remove
the use of the ALSA specific types for the control type. The use of an
ALSA type was unnecessary, the simplified code is easier to read and
avoids Sparse warnings.

Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20210913160057.103842-2-simont@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index f7c800927cb2f968d697545284c8176686192ab9..f5db6e3b9f60ab1c138c8163a6004e44deb4ddee 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -612,7 +612,7 @@ struct wm_coeff_ctl {
        unsigned int set:1;
        struct soc_bytes_ext bytes_ext;
        unsigned int flags;
-       snd_ctl_elem_type_t type;
+       unsigned int type;
 };
 
 static const char *wm_adsp_mem_region_name(unsigned int type)
@@ -1414,7 +1414,7 @@ static int wm_adsp_create_control(struct wm_adsp *dsp,
                                  const struct wm_adsp_alg_region *alg_region,
                                  unsigned int offset, unsigned int len,
                                  const char *subname, unsigned int subname_len,
-                                 unsigned int flags, snd_ctl_elem_type_t type)
+                                 unsigned int flags, unsigned int type)
 {
        struct wm_coeff_ctl *ctl;
        struct wmfw_ctl_work *ctl_work;
@@ -1546,7 +1546,7 @@ struct wm_coeff_parsed_coeff {
        int mem_type;
        const u8 *name;
        int name_len;
-       snd_ctl_elem_type_t ctl_type;
+       unsigned int ctl_type;
        int flags;
        int len;
 };
@@ -1641,7 +1641,7 @@ static inline void wm_coeff_parse_coeff(struct wm_adsp *dsp, const u8 **data,
                blk->mem_type = le16_to_cpu(raw->hdr.type);
                blk->name = raw->name;
                blk->name_len = strlen(raw->name);
-               blk->ctl_type = (__force snd_ctl_elem_type_t)le16_to_cpu(raw->ctl_type);
+               blk->ctl_type = le16_to_cpu(raw->ctl_type);
                blk->flags = le16_to_cpu(raw->flags);
                blk->len = le32_to_cpu(raw->len);
                break;
@@ -1654,9 +1654,7 @@ static inline void wm_coeff_parse_coeff(struct wm_adsp *dsp, const u8 **data,
                                                      &blk->name);
                wm_coeff_parse_string(sizeof(u8), &tmp, NULL);
                wm_coeff_parse_string(sizeof(u16), &tmp, NULL);
-               blk->ctl_type =
-                       (__force snd_ctl_elem_type_t)wm_coeff_parse_int(sizeof(raw->ctl_type),
-                                                                       &tmp);
+               blk->ctl_type = wm_coeff_parse_int(sizeof(raw->ctl_type), &tmp);
                blk->flags = wm_coeff_parse_int(sizeof(raw->flags), &tmp);
                blk->len = wm_coeff_parse_int(sizeof(raw->len), &tmp);
 
@@ -1701,7 +1699,7 @@ static int wm_adsp_parse_coeff(struct wm_adsp *dsp,
                wm_coeff_parse_coeff(dsp, &data, &coeff_blk);
 
                switch (coeff_blk.ctl_type) {
-               case SNDRV_CTL_ELEM_TYPE_BYTES:
+               case WMFW_CTL_TYPE_BYTES:
                        break;
                case WMFW_CTL_TYPE_ACKED:
                        if (coeff_blk.flags & WMFW_CTL_FLAG_SYS)
@@ -2322,7 +2320,7 @@ static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
                                len *= 4;
                                wm_adsp_create_control(dsp, alg_region, 0,
                                                     len, NULL, 0, 0,
-                                                    SNDRV_CTL_ELEM_TYPE_BYTES);
+                                                    WMFW_CTL_TYPE_BYTES);
                        } else {
                                adsp_warn(dsp, "Missing length info for region DM with ID %x\n",
                                          be32_to_cpu(adsp1_alg[i].alg.id));
@@ -2343,7 +2341,7 @@ static int wm_adsp1_setup_algs(struct wm_adsp *dsp)
                                len *= 4;
                                wm_adsp_create_control(dsp, alg_region, 0,
                                                     len, NULL, 0, 0,
-                                                    SNDRV_CTL_ELEM_TYPE_BYTES);
+                                                    WMFW_CTL_TYPE_BYTES);
                        } else {
                                adsp_warn(dsp, "Missing length info for region ZM with ID %x\n",
                                          be32_to_cpu(adsp1_alg[i].alg.id));
@@ -2430,7 +2428,7 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
                                len *= 4;
                                wm_adsp_create_control(dsp, alg_region, 0,
                                                     len, NULL, 0, 0,
-                                                    SNDRV_CTL_ELEM_TYPE_BYTES);
+                                                    WMFW_CTL_TYPE_BYTES);
                        } else {
                                adsp_warn(dsp, "Missing length info for region XM with ID %x\n",
                                          be32_to_cpu(adsp2_alg[i].alg.id));
@@ -2451,7 +2449,7 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
                                len *= 4;
                                wm_adsp_create_control(dsp, alg_region, 0,
                                                     len, NULL, 0, 0,
-                                                    SNDRV_CTL_ELEM_TYPE_BYTES);
+                                                    WMFW_CTL_TYPE_BYTES);
                        } else {
                                adsp_warn(dsp, "Missing length info for region YM with ID %x\n",
                                          be32_to_cpu(adsp2_alg[i].alg.id));
@@ -2472,7 +2470,7 @@ static int wm_adsp2_setup_algs(struct wm_adsp *dsp)
                                len *= 4;
                                wm_adsp_create_control(dsp, alg_region, 0,
                                                     len, NULL, 0, 0,
-                                                    SNDRV_CTL_ELEM_TYPE_BYTES);
+                                                    WMFW_CTL_TYPE_BYTES);
                        } else {
                                adsp_warn(dsp, "Missing length info for region ZM with ID %x\n",
                                          be32_to_cpu(adsp2_alg[i].alg.id));

diff --git a/sound/soc/codecs/wmfw.h b/sound/soc/codecs/wmfw.h
index f3d51602f85c76d86efd22be62256f5e07558fe3..a19bf7c6fc8b06c8aa986ddd9ca037fe6c4851f8 100644 (file)
--- a/sound/soc/codecs/wmfw.h
+++ b/sound/soc/codecs/wmfw.h
@@ -23,10 +23,12 @@
 #define WMFW_CTL_FLAG_WRITEABLE   0x0002
 #define WMFW_CTL_FLAG_READABLE    0x0001
 
+#define WMFW_CTL_TYPE_BYTES       0x0004 /* byte control */
+
 /* Non-ALSA coefficient types start at 0x1000 */
-#define WMFW_CTL_TYPE_ACKED       ((__force snd_ctl_elem_type_t)0x1000) /* acked control */
-#define WMFW_CTL_TYPE_HOSTEVENT   ((__force snd_ctl_elem_type_t)0x1001) /* event control */
-#define WMFW_CTL_TYPE_HOST_BUFFER ((__force snd_ctl_elem_type_t)0x1002) /* host buffer pointer */
+#define WMFW_CTL_TYPE_ACKED       0x1000 /* acked control */
+#define WMFW_CTL_TYPE_HOSTEVENT   0x1001 /* event control */
+#define WMFW_CTL_TYPE_HOST_BUFFER 0x1002 /* host buffer pointer */
 
 struct wmfw_header {
        char magic[4];