aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-08-20 16:53:39 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-09-03 08:36:22 -0400
commit4182438e658dbf01c37a3b0fa035f08c303403ab (patch)
tree2d55f0bcb16d4636220dea7590973ce7dc6b3831
parentc463c9797c43dd66b72daa397716d6c6675087b8 (diff)
[media] drxj: fix sparse warnings
drivers/media/dvb-frontends/drx39xyj/drxj.c:11768:25: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11768:25: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11768:25: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11768:25: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11770:25: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11770:25: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11770:25: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11770:25: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11794:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11794:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11794:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11794:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11794:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11794:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11796:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11796:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11796:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11796:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11798:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11798:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11798:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11798:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11800:33: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11800:33: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11800:33: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11800:33: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11605:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11605:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11605:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11605:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11632:29: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11632:29: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11632:29: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11632:29: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11650:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11650:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11650:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11650:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11650:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11650:34: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11652:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11652:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11652:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11652:34: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11654:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11654:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11654:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11654:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11656:33: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11656:33: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11656:33: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11656:33: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11670:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11670:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11670:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11670:35: warning: cast to restricted __be16 drivers/media/dvb-frontends/drx39xyj/drxj.c:11678:47: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11678:47: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11678:47: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11678:47: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11678:47: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11678:47: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11680:46: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11680:46: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11680:46: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11680:46: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11680:46: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11680:46: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11682:51: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11682:51: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11682:51: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11682:51: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11682:51: warning: cast to restricted __be32 drivers/media/dvb-frontends/drx39xyj/drxj.c:11682:51: warning: cast to restricted __be32 Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/dvb-frontends/drx39xyj/drxj.c38
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c
index 7ca7a21df183..5ec221ffdfca 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drxj.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c
@@ -2174,7 +2174,7 @@ int drxj_dap_atomic_read_reg32(struct i2c_device_addr *dev_addr,
2174 u32 addr, 2174 u32 addr,
2175 u32 *data, u32 flags) 2175 u32 *data, u32 flags)
2176{ 2176{
2177 u8 buf[sizeof(*data)]; 2177 u8 buf[sizeof(*data)] = { 0 };
2178 int rc = -EIO; 2178 int rc = -EIO;
2179 u32 word = 0; 2179 u32 word = 0;
2180 2180
@@ -4193,7 +4193,7 @@ int drxj_dap_scu_atomic_read_reg16(struct i2c_device_addr *dev_addr,
4193 u32 addr, 4193 u32 addr,
4194 u16 *data, u32 flags) 4194 u16 *data, u32 flags)
4195{ 4195{
4196 u8 buf[2]; 4196 u8 buf[2] = { 0 };
4197 int rc = -EIO; 4197 int rc = -EIO;
4198 u16 word = 0; 4198 u16 word = 0;
4199 4199
@@ -10667,7 +10667,7 @@ ctrl_sig_quality(struct drx_demod_instance *demod,
10667 enum drx_standard standard = ext_attr->standard; 10667 enum drx_standard standard = ext_attr->standard;
10668 int rc; 10668 int rc;
10669 u32 ber, cnt, err, pkt; 10669 u32 ber, cnt, err, pkt;
10670 u16 mer, strength; 10670 u16 mer, strength = 0;
10671 10671
10672 rc = get_sig_strength(demod, &strength); 10672 rc = get_sig_strength(demod, &strength);
10673 if (rc < 0) { 10673 if (rc < 0) {
@@ -11602,7 +11602,7 @@ static u16 drx_u_code_compute_crc(u8 *block_data, u16 nr_words)
11602 u32 carry = 0; 11602 u32 carry = 0;
11603 11603
11604 while (i < nr_words) { 11604 while (i < nr_words) {
11605 crc_word |= (u32)be16_to_cpu(*(u32 *)(block_data)); 11605 crc_word |= (u32)be16_to_cpu(*(__be16 *)(block_data));
11606 for (j = 0; j < 16; j++) { 11606 for (j = 0; j < 16; j++) {
11607 crc_word <<= 1; 11607 crc_word <<= 1;
11608 if (carry != 0) 11608 if (carry != 0)
@@ -11629,7 +11629,7 @@ static int drx_check_firmware(struct drx_demod_instance *demod, u8 *mc_data,
11629 int i; 11629 int i;
11630 unsigned count = 2 * sizeof(u16); 11630 unsigned count = 2 * sizeof(u16);
11631 u32 mc_dev_type, mc_version, mc_base_version; 11631 u32 mc_dev_type, mc_version, mc_base_version;
11632 u16 mc_nr_of_blks = be16_to_cpu(*(u32 *)(mc_data + sizeof(u16))); 11632 u16 mc_nr_of_blks = be16_to_cpu(*(__be16 *)(mc_data + sizeof(u16)));
11633 11633
11634 /* 11634 /*
11635 * Scan microcode blocks first for version info 11635 * Scan microcode blocks first for version info
@@ -11647,13 +11647,13 @@ static int drx_check_firmware(struct drx_demod_instance *demod, u8 *mc_data,
11647 goto eof; 11647 goto eof;
11648 11648
11649 /* Process block header */ 11649 /* Process block header */
11650 block_hdr.addr = be32_to_cpu(*(u32 *)(mc_data + count)); 11650 block_hdr.addr = be32_to_cpu(*(__be32 *)(mc_data + count));
11651 count += sizeof(u32); 11651 count += sizeof(u32);
11652 block_hdr.size = be16_to_cpu(*(u32 *)(mc_data + count)); 11652 block_hdr.size = be16_to_cpu(*(__be16 *)(mc_data + count));
11653 count += sizeof(u16); 11653 count += sizeof(u16);
11654 block_hdr.flags = be16_to_cpu(*(u32 *)(mc_data + count)); 11654 block_hdr.flags = be16_to_cpu(*(__be16 *)(mc_data + count));
11655 count += sizeof(u16); 11655 count += sizeof(u16);
11656 block_hdr.CRC = be16_to_cpu(*(u32 *)(mc_data + count)); 11656 block_hdr.CRC = be16_to_cpu(*(__be16 *)(mc_data + count));
11657 count += sizeof(u16); 11657 count += sizeof(u16);
11658 11658
11659 pr_debug("%u: addr %u, size %u, flags 0x%04x, CRC 0x%04x\n", 11659 pr_debug("%u: addr %u, size %u, flags 0x%04x, CRC 0x%04x\n",
@@ -11667,7 +11667,7 @@ static int drx_check_firmware(struct drx_demod_instance *demod, u8 *mc_data,
11667 if (block_hdr.addr + sizeof(u16) > size) 11667 if (block_hdr.addr + sizeof(u16) > size)
11668 goto eof; 11668 goto eof;
11669 11669
11670 auxtype = be16_to_cpu(*(u32 *)(auxblk)); 11670 auxtype = be16_to_cpu(*(__be16 *)(auxblk));
11671 11671
11672 /* Aux block. Check type */ 11672 /* Aux block. Check type */
11673 if (DRX_ISMCVERTYPE(auxtype)) { 11673 if (DRX_ISMCVERTYPE(auxtype)) {
@@ -11675,11 +11675,11 @@ static int drx_check_firmware(struct drx_demod_instance *demod, u8 *mc_data,
11675 goto eof; 11675 goto eof;
11676 11676
11677 auxblk += sizeof(u16); 11677 auxblk += sizeof(u16);
11678 mc_dev_type = be32_to_cpu(*(u32 *)(auxblk)); 11678 mc_dev_type = be32_to_cpu(*(__be32 *)(auxblk));
11679 auxblk += sizeof(u32); 11679 auxblk += sizeof(u32);
11680 mc_version = be32_to_cpu(*(u32 *)(auxblk)); 11680 mc_version = be32_to_cpu(*(__be32 *)(auxblk));
11681 auxblk += sizeof(u32); 11681 auxblk += sizeof(u32);
11682 mc_base_version = be32_to_cpu(*(u32 *)(auxblk)); 11682 mc_base_version = be32_to_cpu(*(__be32 *)(auxblk));
11683 11683
11684 DRX_ATTR_MCRECORD(demod).aux_type = auxtype; 11684 DRX_ATTR_MCRECORD(demod).aux_type = auxtype;
11685 DRX_ATTR_MCRECORD(demod).mc_dev_type = mc_dev_type; 11685 DRX_ATTR_MCRECORD(demod).mc_dev_type = mc_dev_type;
@@ -11765,9 +11765,9 @@ static int drx_ctrl_u_code(struct drx_demod_instance *demod,
11765 11765
11766 mc_data = (void *)mc_data_init; 11766 mc_data = (void *)mc_data_init;
11767 /* Check data */ 11767 /* Check data */
11768 mc_magic_word = be16_to_cpu(*(u32 *)(mc_data)); 11768 mc_magic_word = be16_to_cpu(*(__be16 *)(mc_data));
11769 mc_data += sizeof(u16); 11769 mc_data += sizeof(u16);
11770 mc_nr_of_blks = be16_to_cpu(*(u32 *)(mc_data)); 11770 mc_nr_of_blks = be16_to_cpu(*(__be16 *)(mc_data));
11771 mc_data += sizeof(u16); 11771 mc_data += sizeof(u16);
11772 11772
11773 if ((mc_magic_word != DRX_UCODE_MAGIC_WORD) || (mc_nr_of_blks == 0)) { 11773 if ((mc_magic_word != DRX_UCODE_MAGIC_WORD) || (mc_nr_of_blks == 0)) {
@@ -11791,13 +11791,13 @@ static int drx_ctrl_u_code(struct drx_demod_instance *demod,
11791 u16 mc_block_nr_bytes = 0; 11791 u16 mc_block_nr_bytes = 0;
11792 11792
11793 /* Process block header */ 11793 /* Process block header */
11794 block_hdr.addr = be32_to_cpu(*(u32 *)(mc_data)); 11794 block_hdr.addr = be32_to_cpu(*(__be32 *)(mc_data));
11795 mc_data += sizeof(u32); 11795 mc_data += sizeof(u32);
11796 block_hdr.size = be16_to_cpu(*(u32 *)(mc_data)); 11796 block_hdr.size = be16_to_cpu(*(__be16 *)(mc_data));
11797 mc_data += sizeof(u16); 11797 mc_data += sizeof(u16);
11798 block_hdr.flags = be16_to_cpu(*(u32 *)(mc_data)); 11798 block_hdr.flags = be16_to_cpu(*(__be16 *)(mc_data));
11799 mc_data += sizeof(u16); 11799 mc_data += sizeof(u16);
11800 block_hdr.CRC = be16_to_cpu(*(u32 *)(mc_data)); 11800 block_hdr.CRC = be16_to_cpu(*(__be16 *)(mc_data));
11801 mc_data += sizeof(u16); 11801 mc_data += sizeof(u16);
11802 11802
11803 pr_debug("%u: addr %u, size %u, flags 0x%04x, CRC 0x%04x\n", 11803 pr_debug("%u: addr %u, size %u, flags 0x%04x, CRC 0x%04x\n",