This patch fix the following warnings from sparse,

$ make C=2 drivers/staging/greybus/
drivers/staging/greybus/audio_codec.c:691:36: warning: incorrect type in 
initializer (different base types)
drivers/staging/greybus/audio_codec.c:691:36:    expected unsigned long long 
[usertype] formats
drivers/staging/greybus/audio_codec.c:691:36:    got restricted 
snd_pcm_format_t [usertype]
drivers/staging/greybus/audio_codec.c:701:36: warning: incorrect type in 
initializer (different base types)
drivers/staging/greybus/audio_codec.c:701:36:    expected unsigned long long 
[usertype] formats
drivers/staging/greybus/audio_codec.c:701:36:    got restricted 
snd_pcm_format_t [usertype]
drivers/staging/greybus/audio_module.c:222:25: warning: incorrect type in 
assignment (different base types)
drivers/staging/greybus/audio_module.c:222:25:    expected restricted __le16 
[usertype] data_cport
drivers/staging/greybus/audio_module.c:222:25:    got unsigned short [usertype] 
intf_cport_id
drivers/staging/greybus/audio_topology.c:460:40: warning: restricted __le32 
degrades to integer
drivers/staging/greybus/audio_topology.c:691:41: warning: incorrect type in 
assignment (different base types)
drivers/staging/greybus/audio_topology.c:691:41:    expected unsigned int access
drivers/staging/greybus/audio_topology.c:691:41:    got restricted __le32 
[usertype] access
drivers/staging/greybus/audio_topology.c:746:44: warning: incorrect type in 
assignment (different base types)
drivers/staging/greybus/audio_topology.c:746:44:    expected unsigned int
drivers/staging/greybus/audio_topology.c:746:44:    got restricted __le32
drivers/staging/greybus/audio_topology.c:748:52: warning: incorrect type in 
assignment (different base types)
drivers/staging/greybus/audio_topology.c:748:52:    expected unsigned int
drivers/staging/greybus/audio_topology.c:748:52:    got restricted __le32
drivers/staging/greybus/audio_topology.c:802:42: warning: restricted __le32 
degrades to integer
drivers/staging/greybus/audio_topology.c:805:50: warning: incorrect type in 
assignment (different base types)
drivers/staging/greybus/audio_topology.c:805:50:    expected restricted __le32
drivers/staging/greybus/audio_topology.c:805:50:    got unsigned int
drivers/staging/greybus/audio_topology.c:814:50: warning: restricted __le32 
degrades to integer
drivers/staging/greybus/audio_topology.c:817:58: warning: incorrect type in 
assignment (different base types)
drivers/staging/greybus/audio_topology.c:817:58:    expected restricted __le32
drivers/staging/greybus/audio_topology.c:817:58:    got unsigned int
drivers/staging/greybus/audio_topology.c:889:25: warning: incorrect type in 
assignment (different base types)
drivers/staging/greybus/audio_topology.c:889:25:    expected unsigned int access
drivers/staging/greybus/audio_topology.c:889:25:    got restricted __le32 
[usertype] access

Signed-off-by: Coiby Xu <coiby...@gmail.com>
---
 drivers/staging/greybus/audio_codec.c    |  4 ++--
 drivers/staging/greybus/audio_module.c   |  2 +-
 drivers/staging/greybus/audio_topology.c | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/greybus/audio_codec.c 
b/drivers/staging/greybus/audio_codec.c
index 74538f8c5fa4..494aa823e998 100644
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -688,7 +688,7 @@ static struct snd_soc_dai_driver gbaudio_dai[] = {
                .playback = {
                        .stream_name = "I2S 0 Playback",
                        .rates = SNDRV_PCM_RATE_48000,
-                       .formats = SNDRV_PCM_FORMAT_S16_LE,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
                        .rate_max = 48000,
                        .rate_min = 48000,
                        .channels_min = 1,
@@ -698,7 +698,7 @@ static struct snd_soc_dai_driver gbaudio_dai[] = {
                .capture = {
                        .stream_name = "I2S 0 Capture",
                        .rates = SNDRV_PCM_RATE_48000,
-                       .formats = SNDRV_PCM_FORMAT_S16_LE,
+                       .formats = SNDRV_PCM_FMTBIT_S16_LE,
                        .rate_max = 48000,
                        .rate_min = 48000,
                        .channels_min = 1,
diff --git a/drivers/staging/greybus/audio_module.c 
b/drivers/staging/greybus/audio_module.c
index 16f60256adb2..00848b84b022 100644
--- a/drivers/staging/greybus/audio_module.c
+++ b/drivers/staging/greybus/audio_module.c
@@ -219,7 +219,7 @@ static int gb_audio_add_data_connection(struct 
gbaudio_module_info *gbmodule,
 
        greybus_set_drvdata(bundle, gbmodule);
        dai->id = 0;
-       dai->data_cport = connection->intf_cport_id;
+       dai->data_cport = cpu_to_le16(connection->intf_cport_id);
        dai->connection = connection;
        list_add(&dai->list, &gbmodule->data_list);
 
diff --git a/drivers/staging/greybus/audio_topology.c 
b/drivers/staging/greybus/audio_topology.c
index 83b38ae8908c..56bf1a4f95ad 100644
--- a/drivers/staging/greybus/audio_topology.c
+++ b/drivers/staging/greybus/audio_topology.c
@@ -466,7 +466,7 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol 
*kcontrol,
                goto exit;
 
        /* update ucontrol */
-       if (gbvalue.value.integer_value[0] != val) {
+       if (gbvalue.value.integer_value[0] != cpu_to_le32(val)) {
                for (wi = 0; wi < wlist->num_widgets; wi++) {
                        widget = wlist->widgets[wi];
                        snd_soc_dapm_mixer_update_power(widget->dapm, kcontrol,
@@ -689,7 +689,7 @@ static int gbaudio_tplg_create_kcontrol(struct 
gbaudio_module_info *gb,
                                return -ENOMEM;
                        ctldata->ctl_id = ctl->id;
                        ctldata->data_cport = le16_to_cpu(ctl->data_cport);
-                       ctldata->access = ctl->access;
+                       ctldata->access = le32_to_cpu(ctl->access);
                        ctldata->vcount = ctl->count_values;
                        ctldata->info = &ctl->info;
                        *kctl = (struct snd_kcontrol_new)
@@ -744,10 +744,10 @@ static int gbcodec_enum_dapm_ctl_get(struct snd_kcontrol 
*kcontrol,
                return ret;
        }
 
-       ucontrol->value.enumerated.item[0] = gbvalue.value.enumerated_item[0];
+       ucontrol->value.enumerated.item[0] = 
le32_to_cpu(gbvalue.value.enumerated_item[0]);
        if (e->shift_l != e->shift_r)
                ucontrol->value.enumerated.item[1] =
-                       gbvalue.value.enumerated_item[1];
+                       le32_to_cpu(gbvalue.value.enumerated_item[1]);
 
        return 0;
 }
@@ -801,10 +801,10 @@ static int gbcodec_enum_dapm_ctl_put(struct snd_kcontrol 
*kcontrol,
        mask = e->mask << e->shift_l;
 
        if (gbvalue.value.enumerated_item[0] !=
-           ucontrol->value.enumerated.item[0]) {
+           cpu_to_le32(ucontrol->value.enumerated.item[0])) {
                change = 1;
                gbvalue.value.enumerated_item[0] =
-                       ucontrol->value.enumerated.item[0];
+                       cpu_to_le32(ucontrol->value.enumerated.item[0]);
        }
 
        if (e->shift_l != e->shift_r) {
@@ -813,10 +813,10 @@ static int gbcodec_enum_dapm_ctl_put(struct snd_kcontrol 
*kcontrol,
                val |= ucontrol->value.enumerated.item[1] << e->shift_r;
                mask |= e->mask << e->shift_r;
                if (gbvalue.value.enumerated_item[1] !=
-                   ucontrol->value.enumerated.item[1]) {
+                   cpu_to_le32(ucontrol->value.enumerated.item[1])) {
                        change = 1;
                        gbvalue.value.enumerated_item[1] =
-                               ucontrol->value.enumerated.item[1];
+                               cpu_to_le32(ucontrol->value.enumerated.item[1]);
                }
        }
 
@@ -887,7 +887,7 @@ static int gbaudio_tplg_create_mixer_ctl(struct 
gbaudio_module_info *gb,
                return -ENOMEM;
        ctldata->ctl_id = ctl->id;
        ctldata->data_cport = le16_to_cpu(ctl->data_cport);
-       ctldata->access = ctl->access;
+       ctldata->access = le32_to_cpu(ctl->access);
        ctldata->vcount = ctl->count_values;
        ctldata->info = &ctl->info;
        *kctl = (struct snd_kcontrol_new)
-- 
2.28.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to