[media] wl128x: fix sparse warnings

author Hans Verkuil <hans.verkuil@cisco.com>

Wed, 20 Aug 2014 22:20:12 +0000 (19:20 -0300)

committer Mauro Carvalho Chehab <m.chehab@samsung.com>

Wed, 3 Sep 2014 12:39:15 +0000 (09:39 -0300)
author Hans Verkuil <hans.verkuil@cisco.com>
Wed, 20 Aug 2014 22:20:12 +0000 (19:20 -0300)
committer Mauro Carvalho Chehab <m.chehab@samsung.com>
Wed, 3 Sep 2014 12:39:15 +0000 (09:39 -0300)
diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c

index 4b2e9e8298e1f6e962a468eeb1fba4b91b5c68bd..6f28f6e02ea57e947a2a8805ccccee4cfaa30cc2 100644 (file)
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -440,7 +440,7 @@ static int fm_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type,     void *payload,
                  * command with u16 payload - convert to be16
                  */
                 if (payload != NULL)
-                       *(u16 *)payload = cpu_to_be16(*(u16 *)payload);
+                       *(__be16 *)payload = cpu_to_be16(*(u16 *)payload);
  
         } else if (payload != NULL) {
                 fm_cb(skb)->fm_op = *((u8 *)payload + 2);
@@ -595,7 +595,7 @@ static void fm_irq_handle_flag_getcmd_resp(struct fmdev *fmdev)
         skb_pull(skb, sizeof(struct fm_event_msg_hdr));
         memcpy(&fmdev->irq_info.flag, skb->data, fm_evt_hdr->dlen);
  
-       fmdev->irq_info.flag = be16_to_cpu(fmdev->irq_info.flag);
+       fmdev->irq_info.flag = be16_to_cpu((__force __be16)fmdev->irq_info.flag);
         fmdbg("irq: flag register(0x%x)\n", fmdev->irq_info.flag);
  
         /* Continue next function in interrupt handler table */
@@ -764,7 +764,7 @@ static void fm_irq_handle_rdsdata_getcmd_resp(struct fmdev *fmdev)
                          * Extract PI code and store in local cache.
                          * We need this during AF switch processing.
                          */
-                       cur_picode = be16_to_cpu(rds_fmt.data.groupgeneral.pidata);
+                       cur_picode = be16_to_cpu((__force __be16)rds_fmt.data.groupgeneral.pidata);
                         if (fmdev->rx.stat_info.picode != cur_picode)
                                 fmdev->rx.stat_info.picode = cur_picode;
  
@@ -989,7 +989,7 @@ static void fm_irq_afjump_rd_freq_resp(struct fmdev *fmdev)
         /* Skip header info and copy only response data */
         skb_pull(skb, sizeof(struct fm_event_msg_hdr));
         memcpy(&read_freq, skb->data, sizeof(read_freq));
-       read_freq = be16_to_cpu(read_freq);
+       read_freq = be16_to_cpu((__force __be16)read_freq);
         curr_freq = fmdev->rx.region.bot_freq + ((u32)read_freq * FM_FREQ_MUL);
  
         jumped_freq = fmdev->rx.stat_info.af_cache[fmdev->rx.afjump_idx];
@@ -1317,7 +1317,8 @@ static int load_default_rx_configuration(struct fmdev *fmdev)
  /* Does FM power on sequence */
  static int fm_power_up(struct fmdev *fmdev, u8 mode)
  {
-       u16 payload, asic_id, asic_ver;
+       u16 payload;
+       __be16 asic_id, asic_ver;
         int resp_len, ret;
         u8 fw_name[50];
  
diff --git a/drivers/media/radio/wl128x/fmdrv_rx.c b/drivers/media/radio/wl128x/fmdrv_rx.c

index ebf09a3927deea0f34070d54aa6e3c65b7bd1742..09632cb26cb6980b06238fc1b09bc2b218343e32 100644 (file)
--- a/drivers/media/radio/wl128x/fmdrv_rx.c
+++ b/drivers/media/radio/wl128x/fmdrv_rx.c
@@ -116,7 +116,7 @@ int fm_rx_set_freq(struct fmdev *fmdev, u32 freq)
         if (ret < 0)
                 goto exit;
  
-       curr_frq = be16_to_cpu(curr_frq);
+       curr_frq = be16_to_cpu((__force __be16)curr_frq);
         curr_frq_in_khz = (fmdev->rx.region.bot_freq + ((u32)curr_frq * FM_FREQ_MUL));
  
         if (curr_frq_in_khz != freq) {
@@ -189,7 +189,7 @@ int fm_rx_seek(struct fmdev *fmdev, u32 seek_upward,
         if (ret < 0)
                 return ret;
  
-       curr_frq = be16_to_cpu(curr_frq);
+       curr_frq = be16_to_cpu((__force __be16)curr_frq);
         last_frq = (fmdev->rx.region.top_freq - fmdev->rx.region.bot_freq) / FM_FREQ_MUL;
  
         /* Check the offset in order to be aligned to the channel spacing*/
@@ -285,7 +285,7 @@ again:
                 if (ret < 0)
                         return ret;
  
-               curr_frq = be16_to_cpu(curr_frq);
+               curr_frq = be16_to_cpu((__force __be16)curr_frq);
                 fmdev->rx.freq = (fmdev->rx.region.bot_freq +
                                 ((u32)curr_frq * FM_FREQ_MUL));
  
@@ -517,7 +517,7 @@ int fm_rx_set_rfdepend_softmute(struct fmdev *fmdev, u8 rfdepend_mute)
  /* Returns the signal strength level of current channel */
  int fm_rx_get_rssi_level(struct fmdev *fmdev, u16 *rssilvl)
  {
-       u16 curr_rssi_lel;
+       __be16 curr_rssi_lel;
         u32 resp_len;
         int ret;
  
@@ -608,7 +608,7 @@ int fm_rx_set_stereo_mono(struct fmdev *fmdev, u16 mode)
  /* Gets current RX stereo/mono mode */
  int fm_rx_get_stereo_mono(struct fmdev *fmdev, u16 *mode)
  {
-       u16 curr_mode;
+       __be16 curr_mode;
         u32 resp_len;
         int ret;
  
diff --git a/drivers/media/radio/wl128x/fmdrv_tx.c b/drivers/media/radio/wl128x/fmdrv_tx.c

index 6ea33e09d63b23b306979142ace913d6806f561f..839970b0f313522a31edfc0430f0d15652f47526 100644 (file)
--- a/drivers/media/radio/wl128x/fmdrv_tx.c
+++ b/drivers/media/radio/wl128x/fmdrv_tx.c
@@ -374,7 +374,7 @@ int fm_tx_get_tune_cap_val(struct fmdev *fmdev)
         if (ret < 0)
                 return ret;
  
-       curr_val = be16_to_cpu(curr_val);
+       curr_val = be16_to_cpu((__force __be16)curr_val);
  
         return curr_val;
  }
author	Hans Verkuil <hans.verkuil@cisco.com>
	Wed, 20 Aug 2014 22:20:12 +0000 (19:20 -0300)
committer	Mauro Carvalho Chehab <m.chehab@samsung.com>
	Wed, 3 Sep 2014 12:39:15 +0000 (09:39 -0300)
drivers/media/radio/wl128x/fmdrv_common.c		patch \| blob \| history
drivers/media/radio/wl128x/fmdrv_rx.c		patch \| blob \| history
drivers/media/radio/wl128x/fmdrv_tx.c		patch \| blob \| history