From: Yasunari Takiguchi <yasunari.takigu...@sony.com>

This is the modification of structure declaration for spi_transfer. 

Signed-off-by: Yasunari Takiguchi <yasunari.takigu...@sony.com>
Signed-off-by: Masayuki Yamamoto <masayuki.yamam...@sony.com>
Signed-off-by: Hideki Nozawa <hideki.noz...@sony.com>
Signed-off-by: Kota Yonezawa <kota.yonez...@sony.com>
Signed-off-by: Toshihiko Matsumoto <toshihiko.matsum...@sony.com>
Signed-off-by: Satoshi Watanabe <satoshi.c.watan...@sony.com>
---
[Change list]
   drivers/media/spi/cxd2880-spi.c
      -modified how to declare spi_transfer structure

 drivers/media/spi/cxd2880-spi.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/media/spi/cxd2880-spi.c b/drivers/media/spi/cxd2880-spi.c
index 4df3bd312f48..754940f7e964 100644
--- a/drivers/media/spi/cxd2880-spi.c
+++ b/drivers/media/spi/cxd2880-spi.c
@@ -60,14 +60,13 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 static int cxd2880_write_spi(struct spi_device *spi, u8 *data, u32 size)
 {
        struct spi_message msg;
-       struct spi_transfer tx;
+       struct spi_transfer tx = {};
 
        if (!spi || !data) {
                pr_err("invalid arg\n");
                return -EINVAL;
        }
 
-       memset(&tx, 0, sizeof(tx));
        tx.tx_buf = data;
        tx.len = size;
 
@@ -130,7 +129,7 @@ static int cxd2880_spi_read_ts(struct spi_device *spi,
        int ret;
        u8 data[3];
        struct spi_message message;
-       struct spi_transfer transfer[2];
+       struct spi_transfer transfer[2] = {};
 
        if (!spi || !read_data || !packet_num) {
                pr_err("invalid arg\n");
@@ -146,7 +145,6 @@ static int cxd2880_spi_read_ts(struct spi_device *spi,
        data[2] = packet_num;
 
        spi_message_init(&message);
-       memset(transfer, 0, sizeof(transfer));
 
        transfer[0].len = 3;
        transfer[0].tx_buf = data;
@@ -383,7 +381,7 @@ static int cxd2880_start_feed(struct dvb_demux_feed *feed)
                        }
                }
                if (i == CXD2880_MAX_FILTER_SIZE) {
-                       pr_err("PID filter is full. Assumed bug.\n");
+                       pr_err("PID filter is full.\n");
                        return -EINVAL;
                }
                if (!dvb_spi->all_pid_feed_count)
-- 
2.15.1

Reply via email to