Commit 447f0081 authored by Yasunari Takiguchi's avatar Yasunari Takiguchi Committed by Mauro Carvalho Chehab

media: cxd2880-spi: Modified how to declare structure

This is the modification of structure declaration for spi_transfer.
Signed-off-by: default avatarYasunari Takiguchi <Yasunari.Takiguchi@sony.com>
Signed-off-by: default avatarMasayuki Yamamoto <Masayuki.Yamamoto@sony.com>
Signed-off-by: default avatarHideki Nozawa <Hideki.Nozawa@sony.com>
Signed-off-by: default avatarKota Yonezawa <Kota.Yonezawa@sony.com>
Signed-off-by: default avatarToshihiko Matsumoto <Toshihiko.Matsumoto@sony.com>
Signed-off-by: default avatarSatoshi Watanabe <Satoshi.C.Watanabe@sony.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 12b2efeb
...@@ -60,14 +60,13 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); ...@@ -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) static int cxd2880_write_spi(struct spi_device *spi, u8 *data, u32 size)
{ {
struct spi_message msg; struct spi_message msg;
struct spi_transfer tx; struct spi_transfer tx = {};
if (!spi || !data) { if (!spi || !data) {
pr_err("invalid arg\n"); pr_err("invalid arg\n");
return -EINVAL; return -EINVAL;
} }
memset(&tx, 0, sizeof(tx));
tx.tx_buf = data; tx.tx_buf = data;
tx.len = size; tx.len = size;
...@@ -120,7 +119,7 @@ static int cxd2880_spi_read_ts(struct spi_device *spi, ...@@ -120,7 +119,7 @@ static int cxd2880_spi_read_ts(struct spi_device *spi,
int ret; int ret;
u8 data[3]; u8 data[3];
struct spi_message message; struct spi_message message;
struct spi_transfer transfer[2]; struct spi_transfer transfer[2] = {};
if (!spi || !read_data || !packet_num) { if (!spi || !read_data || !packet_num) {
pr_err("invalid arg\n"); pr_err("invalid arg\n");
...@@ -136,7 +135,6 @@ static int cxd2880_spi_read_ts(struct spi_device *spi, ...@@ -136,7 +135,6 @@ static int cxd2880_spi_read_ts(struct spi_device *spi,
data[2] = packet_num; data[2] = packet_num;
spi_message_init(&message); spi_message_init(&message);
memset(transfer, 0, sizeof(transfer));
transfer[0].len = 3; transfer[0].len = 3;
transfer[0].tx_buf = data; transfer[0].tx_buf = data;
...@@ -373,7 +371,7 @@ static int cxd2880_start_feed(struct dvb_demux_feed *feed) ...@@ -373,7 +371,7 @@ static int cxd2880_start_feed(struct dvb_demux_feed *feed)
} }
} }
if (i == CXD2880_MAX_FILTER_SIZE) { if (i == CXD2880_MAX_FILTER_SIZE) {
pr_err("PID filter is full. Assumed bug.\n"); pr_err("PID filter is full.\n");
return -EINVAL; return -EINVAL;
} }
if (!dvb_spi->all_pid_feed_count) if (!dvb_spi->all_pid_feed_count)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment