ASoC: wm_adsp: Correct some minor issues

The wm_adsp_ops structures should be static and correct two printf
specifiers.

Fixes: 170b1e123f38 ("ASoC: wm_adsp: Add support for new Halo core DSPs")
Fixes: 4e08d50d1fb6 ("ASoC: wm_adsp: Factor out DSP specific operations")
Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Charles Keepax <ckeepax@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 644aaf1d274038ed197637fbc515b9d586323f23..5e615fbddf9a7dfceee29ef81b47c709c9a6caec 100644 (file)
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -306,9 +306,9 @@
 #define HALO_MPU_VIO_ERR_SRC_MASK           0x00007fff
 #define HALO_MPU_VIO_ERR_SRC_SHIFT                   0
 
-struct wm_adsp_ops wm_adsp1_ops;
-struct wm_adsp_ops wm_adsp2_ops[];
-struct wm_adsp_ops wm_halo_ops;
+static struct wm_adsp_ops wm_adsp1_ops;
+static struct wm_adsp_ops wm_adsp2_ops[];
+static struct wm_adsp_ops wm_halo_ops;
 
 struct wm_adsp_buf {
        struct list_head list;
@@ -2142,7 +2142,7 @@ static void wmfw_parse_id_header(struct wm_adsp *dsp,
        dsp->fw_id = be32_to_cpu(fw->id);
        dsp->fw_id_version = be32_to_cpu(fw->ver);
 
-       adsp_info(dsp, "Firmware: %x v%d.%d.%d, %zu algorithms\n",
+       adsp_info(dsp, "Firmware: %x v%d.%d.%d, %d algorithms\n",
                  dsp->fw_id, (dsp->fw_id_version & 0xff0000) >> 16,
                  (dsp->fw_id_version & 0xff00) >> 8, dsp->fw_id_version & 0xff,
                  nalgs);
@@ -2155,7 +2155,7 @@ static void wmfw_v3_parse_id_header(struct wm_adsp *dsp,
        dsp->fw_id_version = be32_to_cpu(fw->ver);
        dsp->fw_vendor_id = be32_to_cpu(fw->vendor_id);
 
-       adsp_info(dsp, "Firmware: %x vendor: 0x%x v%d.%d.%d, %zu algorithms\n",
+       adsp_info(dsp, "Firmware: %x vendor: 0x%x v%d.%d.%d, %d algorithms\n",
                  dsp->fw_id, dsp->fw_vendor_id,
                  (dsp->fw_id_version & 0xff0000) >> 16,
                  (dsp->fw_id_version & 0xff00) >> 8, dsp->fw_id_version & 0xff,
@@ -4407,13 +4407,13 @@ irqreturn_t wm_halo_wdt_expire(int irq, void *data)
 }
 EXPORT_SYMBOL_GPL(wm_halo_wdt_expire);
 
-struct wm_adsp_ops wm_adsp1_ops = {
+static struct wm_adsp_ops wm_adsp1_ops = {
        .validate_version = wm_adsp_validate_version,
        .parse_sizes = wm_adsp1_parse_sizes,
        .region_to_reg = wm_adsp_region_to_reg,
 };
 
-struct wm_adsp_ops wm_adsp2_ops[] = {
+static struct wm_adsp_ops wm_adsp2_ops[] = {
        {
                .sys_config_size = sizeof(struct wm_adsp_system_config_xm_hdr),
                .parse_sizes = wm_adsp2_parse_sizes,
@@ -4474,7 +4474,7 @@ struct wm_adsp_ops wm_adsp2_ops[] = {
        },
 };
 
-struct wm_adsp_ops wm_halo_ops = {
+static struct wm_adsp_ops wm_halo_ops = {
        .sys_config_size = sizeof(struct wm_halo_system_config_xm_hdr),
        .parse_sizes = wm_adsp2_parse_sizes,
        .validate_version = wm_halo_validate_version,