[PATCH 00/14] Fixes for sparse warnings

[PATCH 00/14] Fixes for sparse warnings

[Hans Verkuil]

This is a first set of fixes for sparse warnings. There are lots more, but
you have to start somewhere...

Regards,

	Hans

[PATCH 01/14] hdpvr: fix sparse warnings

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/usb/hdpvr/hdpvr-core.c:110:54: warning: incorrect type in argument 1 (different base types)
drivers/media/usb/hdpvr/hdpvr-core.c:112:39: warning: invalid assignment: +=
drivers/media/usb/hdpvr/hdpvr-core.c:304:26: warning: Using plain integer as NULL pointer

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 drivers/media/usb/hdpvr/hdpvr-core.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
index 6e50707..2f0c89c 100644
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -78,7 +78,8 @@ void hdpvr_delete(struct hdpvr_device *dev)
 
 static void challenge(u8 *bytes)
 {
-	u64 *i64P, tmp64;
+	__le64 *i64P;
+	u64 tmp64;
 	uint i, idx;
 
 	for (idx = 0; idx < 32; ++idx) {
@@ -106,10 +107,10 @@ static void challenge(u8 *bytes)
 			for (i = 0; i < 3; i++)
 				bytes[1] *= bytes[6] + 1;
 			for (i = 0; i < 3; i++) {
-				i64P = (u64 *)bytes;
+				i64P = (__le64 *)bytes;
 				tmp64 = le64_to_cpup(i64P);
-				tmp64 <<= bytes[7] & 0x0f;
-				*i64P += cpu_to_le64(tmp64);
+				tmp64 = tmp64 + (tmp64 << (bytes[7] & 0x0f));
+				*i64P = cpu_to_le64(tmp64);
 			}
 			break;
 		}
@@ -301,8 +302,6 @@ static int hdpvr_probe(struct usb_interface *interface,
 		goto error;
 	}
 
-	dev->workqueue = 0;
-
 	/* init video transfer queues first of all */
 	/* to prevent oops in hdpvr_delete() on error paths */
 	INIT_LIST_HEAD(&dev->free_buff_list);
-- 
1.8.3.2

[PATCH 02/14] pvrusb2: fix sparse warning

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2871:13: warning: symbol 'pvr2_hdw_get_detected_std' was not declared. Should it be static?

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Mike Isely <isely@pobox.com>
---
 drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
index c4d51d7..ea05f67 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
@@ -2868,7 +2868,7 @@ static void pvr2_subdev_set_control(struct pvr2_hdw *hdw, int id,
 		pvr2_subdev_set_control(hdw, id, #lab, (hdw)->lab##_val); \
 	}
 
-v4l2_std_id pvr2_hdw_get_detected_std(struct pvr2_hdw *hdw)
+static v4l2_std_id pvr2_hdw_get_detected_std(struct pvr2_hdw *hdw)
 {
 	v4l2_std_id std;
 	std = (v4l2_std_id)hdw->std_mask_avail;
-- 
1.8.3.2

[PATCH 03/14] timblogiw: fix two sparse warnings

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/platform/timblogiw.c:763:43: warning: incorrect type in initializer (incompatible argument 3 (different signedness))
drivers/media/platform/timblogiw.c:764:43: warning: incorrect type in initializer (incompatible argument 3 (different signedness))

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Richard Röjfors <richard.rojfors@pelagicore.com>
---
 drivers/media/platform/timblogiw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c
index b557caf..6a74ce0 100644
--- a/drivers/media/platform/timblogiw.c
+++ b/drivers/media/platform/timblogiw.c
@@ -403,7 +403,7 @@ static int timblogiw_s_input(struct file *file, void  *priv, unsigned int input)
 	return 0;
 }
 
-static int timblogiw_streamon(struct file *file, void  *priv, unsigned int type)
+static int timblogiw_streamon(struct file *file, void  *priv, enum v4l2_buf_type type)
 {
 	struct video_device *vdev = video_devdata(file);
 	struct timblogiw_fh *fh = priv;
@@ -420,7 +420,7 @@ static int timblogiw_streamon(struct file *file, void  *priv, unsigned int type)
 }
 
 static int timblogiw_streamoff(struct file *file, void  *priv,
-	unsigned int type)
+	enum v4l2_buf_type type)
 {
 	struct video_device *vdev = video_devdata(file);
 	struct timblogiw_fh *fh = priv;
-- 
1.8.3.2

[PATCH 04/14] tuner-xs2028.c: fix sparse warnings

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/tuners/tuner-xc2028.c:575:24: warning: cast to restricted __le16
drivers/media/tuners/tuner-xc2028.c:686:21: warning: cast to restricted __le16

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
 drivers/media/tuners/tuner-xc2028.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c
index 878d2c4..e287a74 100644
--- a/drivers/media/tuners/tuner-xc2028.c
+++ b/drivers/media/tuners/tuner-xc2028.c
@@ -572,7 +572,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
 			return -EINVAL;
 		}
 
-		size = le16_to_cpu(*(__u16 *) p);
+		size = le16_to_cpu(*(__le16 *) p);
 		p += sizeof(size);
 
 		if (size == 0xffff)
@@ -683,7 +683,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
 		/* 16 SCODE entries per file; each SCODE entry is 12 bytes and
 		 * has a 2-byte size header in the firmware format. */
 		if (priv->firm[pos].size != 14 * 16 || scode >= 16 ||
-		    le16_to_cpu(*(__u16 *)(p + 14 * scode)) != 12)
+		    le16_to_cpu(*(__le16 *)(p + 14 * scode)) != 12)
 			return -EINVAL;
 		p += 14 * scode + 2;
 	}
-- 
1.8.3.2

[PATCH 05/14] cxd2820r_core: fix sparse warnings

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/dvb-frontends/cxd2820r_core.c:34:32: error: cannot size expression
drivers/media/dvb-frontends/cxd2820r_core.c:68:32: error: cannot size expression

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Antti Palosaari <crope@iki.fi>
---
 drivers/media/dvb-frontends/cxd2820r_core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
index 7ca5c69..d9eeeb1 100644
--- a/drivers/media/dvb-frontends/cxd2820r_core.c
+++ b/drivers/media/dvb-frontends/cxd2820r_core.c
@@ -31,7 +31,7 @@ static int cxd2820r_wr_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg,
 		{
 			.addr = i2c,
 			.flags = 0,
-			.len = sizeof(buf),
+			.len = len + 1,
 			.buf = buf,
 		}
 	};
@@ -65,7 +65,7 @@ static int cxd2820r_rd_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg,
 		}, {
 			.addr = i2c,
 			.flags = I2C_M_RD,
-			.len = sizeof(buf),
+			.len = len,
 			.buf = buf,
 		}
 	};
-- 
1.8.3.2

[PATCH 06/14] drxd_hard: fix sparse warnings

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/dvb-frontends/drxd_hard.c:1017:70: warning: Using plain integer as NULL pointer
drivers/media/dvb-frontends/drxd_hard.c:1038:69: warning: Using plain integer as NULL pointer
drivers/media/dvb-frontends/drxd_hard.c:2836:33: warning: Using plain integer as NULL pointer
drivers/media/dvb-frontends/drxd_hard.c:2972:30: warning: Using plain integer as NULL pointer

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Antti Palosaari <crope@iki.fi>
---
 drivers/media/dvb-frontends/drxd_hard.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
index cbd7c92..959ae36 100644
--- a/drivers/media/dvb-frontends/drxd_hard.c
+++ b/drivers/media/dvb-frontends/drxd_hard.c
@@ -1014,7 +1014,7 @@ static int HI_CfgCommand(struct drxd_state *state)
 		status = Write16(state, HI_RA_RAM_SRV_CMD__A,
 				 HI_RA_RAM_SRV_CMD_CONFIG, 0);
 	else
-		status = HI_Command(state, HI_RA_RAM_SRV_CMD_CONFIG, 0);
+		status = HI_Command(state, HI_RA_RAM_SRV_CMD_CONFIG, NULL);
 	mutex_unlock(&state->mutex);
 	return status;
 }
@@ -1035,7 +1035,7 @@ static int HI_ResetCommand(struct drxd_state *state)
 	status = Write16(state, HI_RA_RAM_SRV_RST_KEY__A,
 			 HI_RA_RAM_SRV_RST_KEY_ACT, 0);
 	if (status == 0)
-		status = HI_Command(state, HI_RA_RAM_SRV_CMD_RESET, 0);
+		status = HI_Command(state, HI_RA_RAM_SRV_CMD_RESET, NULL);
 	mutex_unlock(&state->mutex);
 	msleep(1);
 	return status;
@@ -2833,7 +2833,7 @@ static int drxd_init(struct dvb_frontend *fe)
 	int err = 0;
 
 /*	if (request_firmware(&state->fw, "drxd.fw", state->dev)<0) */
-	return DRXD_init(state, 0, 0);
+	return DRXD_init(state, NULL, 0);
 
 	err = DRXD_init(state, state->fw->data, state->fw->size);
 	release_firmware(state->fw);
@@ -2969,7 +2969,7 @@ struct dvb_frontend *drxd_attach(const struct drxd_config *config,
 
 	mutex_init(&state->mutex);
 
-	if (Read16(state, 0, 0, 0) < 0)
+	if (Read16(state, 0, NULL, 0) < 0)
 		goto error;
 
 	state->frontend.ops = drxd_ops;
-- 
1.8.3.2

[PATCH 07/14] drxk_hard: fix sparse warnings

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/dvb-frontends/drxk_hard.c:1086:62: warning: Using plain integer as NULL pointer
drivers/media/dvb-frontends/drxk_hard.c:2784:63: warning: Using plain integer as NULL pointer

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Antti Palosaari <crope@iki.fi>
---
 drivers/media/dvb-frontends/drxk_hard.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
index 082014d..d416c15 100644
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -1083,7 +1083,7 @@ static int hi_cfg_command(struct drxk_state *state)
 			 SIO_HI_RA_RAM_PAR_1_PAR1_SEC_KEY);
 	if (status < 0)
 		goto error;
-	status = hi_command(state, SIO_HI_RA_RAM_CMD_CONFIG, 0);
+	status = hi_command(state, SIO_HI_RA_RAM_CMD_CONFIG, NULL);
 	if (status < 0)
 		goto error;
 
@@ -2781,7 +2781,7 @@ static int ConfigureI2CBridge(struct drxk_state *state, bool b_enable_bridge)
 			goto error;
 	}
 
-	status = hi_command(state, SIO_HI_RA_RAM_CMD_BRDCTRL, 0);
+	status = hi_command(state, SIO_HI_RA_RAM_CMD_BRDCTRL, NULL);
 
 error:
 	if (status < 0)
-- 
1.8.3.2

[PATCH 08/14] fmdrv_common: fix sparse warning

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/radio/wl128x/fmdrv_common.c:178:6: warning: symbol 'g_st_write' was not declared. Should it be static?

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Manjunatha Halli <manjunatha_halli@ti.com>
---
 drivers/media/radio/wl128x/fmdrv_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
index 253f307..4b2e9e8 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -175,7 +175,7 @@ static int_handler_prototype int_handler_table[] = {
 	fm_irq_handle_intmsk_cmd_resp
 };
 
-long (*g_st_write) (struct sk_buff *skb);
+static long (*g_st_write) (struct sk_buff *skb);
 static struct completion wait_for_fmdrv_reg_comp;
 
 static inline void fm_irq_call(struct fmdev *fmdev)
-- 
1.8.3.2

[PATCH 09/14] radio-keene: fix sparse warning

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/radio/radio-keene.c:126:45: warning: dubious: !x | y

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 drivers/media/radio/radio-keene.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/radio/radio-keene.c b/drivers/media/radio/radio-keene.c
index 21db23b..fa39640 100644
--- a/drivers/media/radio/radio-keene.c
+++ b/drivers/media/radio/radio-keene.c
@@ -123,7 +123,7 @@ static int keene_cmd_set(struct keene_device *radio)
 	/* If bit 0 is set, then transmit mono, otherwise stereo.
 	   If bit 2 is set, then enable 75 us preemphasis, otherwise
 	   it is 50 us. */
-	radio->buffer[3] = (!radio->stereo) | (radio->preemph_75_us ? 4 : 0);
+	radio->buffer[3] = (radio->stereo ? 0 : 1) | (radio->preemph_75_us ? 4 : 0);
 	radio->buffer[4] = 0x00;
 	radio->buffer[5] = 0x00;
 	radio->buffer[6] = 0x00;
-- 
1.8.3.2

[PATCH 10/14] az6027: fix sparse warnings

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/usb/dvb-usb/az6027.c:257:23: warning: symbol 'az6027_stb0899_config' was not declared. Should it be static?
drivers/media/usb/dvb-usb/az6027.c:294:23: warning: symbol 'az6027_stb6100_config' was not declared. Should it be static?

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 drivers/media/usb/dvb-usb/az6027.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/usb/dvb-usb/az6027.c b/drivers/media/usb/dvb-usb/az6027.c
index ea2d5ee..c11138e 100644
--- a/drivers/media/usb/dvb-usb/az6027.c
+++ b/drivers/media/usb/dvb-usb/az6027.c
@@ -254,7 +254,7 @@ static const struct stb0899_s1_reg az6027_stb0899_s1_init_3[] = {
 
 
 
-struct stb0899_config az6027_stb0899_config = {
+static struct stb0899_config az6027_stb0899_config = {
 	.init_dev		= az6027_stb0899_s1_init_1,
 	.init_s2_demod		= stb0899_s2_init_2,
 	.init_s1_demod		= az6027_stb0899_s1_init_3,
@@ -291,7 +291,7 @@ struct stb0899_config az6027_stb0899_config = {
 	.tuner_set_rfsiggain	= NULL,
 };
 
-struct stb6100_config az6027_stb6100_config = {
+static struct stb6100_config az6027_stb6100_config = {
 	.tuner_address	= 0xc0,
 	.refclock	= 27000000,
 };
-- 
1.8.3.2

[PATCH 11/14] cx231xx: fix sparse warnings

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c:31:19: warning: symbol 'cx231xx_Scenario' was not declared. Should it be static?
drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c:675:23: warning: cast to restricted __le32

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c
index d7308ab..2a34cee 100644
--- a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c
+++ b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c
@@ -28,7 +28,7 @@ MODULE_PARM_DESC(pcb_debug, "enable pcb config debug messages [video]");
 
 /******************************************************************************/
 
-struct pcb_config cx231xx_Scenario[] = {
+static struct pcb_config cx231xx_Scenario[] = {
 	{
 	 INDEX_SELFPOWER_DIGITAL_ONLY,	/* index */
 	 USB_SELF_POWER,	/* power_type */
@@ -672,7 +672,7 @@ u32 initialize_cx231xx(struct cx231xx *dev)
 	pcb config it is related to */
 	cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, BOARD_CFG_STAT, data, 4);
 
-	config_info = le32_to_cpu(*((u32 *) data));
+	config_info = le32_to_cpu(*((__le32 *)data));
 	usb_speed = (u8) (config_info & 0x1);
 
 	/* Verify this device belongs to Bus power or Self power device */
-- 
1.8.3.2

[PATCH 12/14] tlg2300: fix sparse warning

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/usb/tlg2300/pd-main.c:235:25: warning: incorrect type in assignment (different base types)

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Huang Shijie <shijie8@gmail.com>
---
 drivers/media/usb/tlg2300/pd-main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/usb/tlg2300/pd-main.c b/drivers/media/usb/tlg2300/pd-main.c
index 95f94e5..3316caa 100644
--- a/drivers/media/usb/tlg2300/pd-main.c
+++ b/drivers/media/usb/tlg2300/pd-main.c
@@ -232,7 +232,7 @@ static int firmware_download(struct usb_device *udev)
 		goto out;
 	}
 
-	max_packet_size = udev->ep_out[0x1]->desc.wMaxPacketSize;
+	max_packet_size = le16_to_cpu(udev->ep_out[0x1]->desc.wMaxPacketSize);
 	log("\t\t download size : %d", (int)max_packet_size);
 
 	for (offset = 0; offset < fwlength; offset += max_packet_size) {
-- 
1.8.3.2

[PATCH 13/14] cx25821: fix sparse warnings

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/pci/cx25821/cx25821-cards.c:49:20: warning: symbol 'cx25821_bcount' was not declared. Should it be static?
drivers/media/pci/cx25821/cx25821-video-upstream.c:162:33: warning: incorrect type in assignment (different base types)
drivers/media/pci/cx25821/cx25821-video-upstream.c:163:33: warning: incorrect type in assignment (different base types)
drivers/media/pci/cx25821/cx25821-video-upstream.c:164:33: warning: incorrect type in assignment (different base types)
drivers/media/pci/cx25821/cx25821-video-upstream.c:165:33: warning: incorrect type in assignment (different base types)
drivers/media/pci/cx25821/cx25821-medusa-video.h:43:16: warning: symbol '_num_decoders' was not declared. Should it be static?
drivers/media/pci/cx25821/cx25821-medusa-video.h:44:16: warning: symbol '_num_cameras' was not declared. Should it be static?
drivers/media/pci/cx25821/cx25821-medusa-video.h:46:14: warning: symbol '_video_standard' was not declared. Should it be static?
drivers/media/pci/cx25821/cx25821-medusa-video.h:47:5: warning: symbol '_display_field_cnt' was not declared. Should it be static?

After analyzing the last four warnings carefully it became clear that these
variables were really completely unused. As a result of that the call to
medusa_set_decoderduration() is now dubious since the duration is always 0.

Without documentation, however, I can't tell what the right value is.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
 drivers/media/pci/cx25821/cx25821-cards.c          |  2 --
 drivers/media/pci/cx25821/cx25821-medusa-video.c   | 18 ++++++++++--------
 drivers/media/pci/cx25821/cx25821-medusa-video.h   |  6 ------
 drivers/media/pci/cx25821/cx25821-video-upstream.c |  8 ++++----
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/drivers/media/pci/cx25821/cx25821-cards.c b/drivers/media/pci/cx25821/cx25821-cards.c
index 3b409fe..f2ebc98 100644
--- a/drivers/media/pci/cx25821/cx25821-cards.c
+++ b/drivers/media/pci/cx25821/cx25821-cards.c
@@ -45,5 +45,3 @@ struct cx25821_board cx25821_boards[] = {
 	},
 
 };
-
-const unsigned int cx25821_bcount = ARRAY_SIZE(cx25821_boards);
diff --git a/drivers/media/pci/cx25821/cx25821-medusa-video.c b/drivers/media/pci/cx25821/cx25821-medusa-video.c
index 22fa044..43bdfa4 100644
--- a/drivers/media/pci/cx25821/cx25821-medusa-video.c
+++ b/drivers/media/pci/cx25821/cx25821-medusa-video.c
@@ -438,7 +438,7 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,
 		decoder_count = decoder_select + 1;
 	} else {
 		decoder = 0;
-		decoder_count = _num_decoders;
+		decoder_count = dev->_max_num_decoders;
 	}
 
 	switch (width) {
@@ -506,8 +506,6 @@ static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,
 		break;
 	}
 
-	_display_field_cnt[decoder] = duration;
-
 	/* update hardware */
 	fld_cnt = cx25821_i2c_read(&dev->i2c_bus[0], disp_cnt_reg, &tmp);
 
@@ -667,8 +665,6 @@ int medusa_video_init(struct cx25821_dev *dev)
 	int ret_val = 0;
 	int i = 0;
 
-	_num_decoders = dev->_max_num_decoders;
-
 	/* disable Auto source selection on all video decoders */
 	value = cx25821_i2c_read(&dev->i2c_bus[0], MON_A_CTRL, &tmp);
 	value &= 0xFFFFF0FF;
@@ -685,8 +681,14 @@ int medusa_video_init(struct cx25821_dev *dev)
 	if (ret_val < 0)
 		goto error;
 
-	for (i = 0; i < _num_decoders; i++)
-		medusa_set_decoderduration(dev, i, _display_field_cnt[i]);
+	/*
+	 * FIXME: due to a coding bug the duration was always 0. It's
+	 * likely that it really should be something else, but due to the
+	 * lack of documentation I have no idea what it should be. For
+	 * now just fill in 0 as the duration.
+	 */
+	for (i = 0; i < dev->_max_num_decoders; i++)
+		medusa_set_decoderduration(dev, i, 0);
 
 	/* Select monitor as DENC A input, power up the DAC */
 	value = cx25821_i2c_read(&dev->i2c_bus[0], DENC_AB_CTRL, &tmp);
@@ -717,7 +719,7 @@ int medusa_video_init(struct cx25821_dev *dev)
 	/* Turn on all of the data out and control output pins. */
 	value = cx25821_i2c_read(&dev->i2c_bus[0], PIN_OE_CTRL, &tmp);
 	value &= 0xFEF0FE00;
-	if (_num_decoders == MAX_DECODERS) {
+	if (dev->_max_num_decoders == MAX_DECODERS) {
 		/*
 		 * Note: The octal board does not support control pins(bit16-19)
 		 * These bits are ignored in the octal board.
diff --git a/drivers/media/pci/cx25821/cx25821-medusa-video.h b/drivers/media/pci/cx25821/cx25821-medusa-video.h
index 6175e09..8bf602f 100644
--- a/drivers/media/pci/cx25821/cx25821-medusa-video.h
+++ b/drivers/media/pci/cx25821/cx25821-medusa-video.h
@@ -40,10 +40,4 @@
 #define CONTRAST_DEFAULT                5000
 #define HUE_DEFAULT                     5000
 
-unsigned short _num_decoders;
-unsigned short _num_cameras;
-
-unsigned int _video_standard;
-int _display_field_cnt[MAX_DECODERS];
-
 #endif
diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream.c b/drivers/media/pci/cx25821/cx25821-video-upstream.c
index 88ffef4..1f43be0 100644
--- a/drivers/media/pci/cx25821/cx25821-video-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-video-upstream.c
@@ -159,10 +159,10 @@ static __le32 *cx25821_risc_field_upstream(struct cx25821_channel *chan, __le32
 		 * For the upstream video channel, the risc engine will enable
 		 * the FIFO. */
 		if (fifo_enable && line == 3) {
-			*(rp++) = RISC_WRITECR;
-			*(rp++) = sram_ch->dma_ctl;
-			*(rp++) = FLD_VID_FIFO_EN;
-			*(rp++) = 0x00000001;
+			*(rp++) = cpu_to_le32(RISC_WRITECR);
+			*(rp++) = cpu_to_le32(sram_ch->dma_ctl);
+			*(rp++) = cpu_to_le32(FLD_VID_FIFO_EN);
+			*(rp++) = cpu_to_le32(0x00000001);
 		}
 	}
 
-- 
1.8.3.2

[PATCH 14/14] siano: fix sparse warnings

[Hans Verkuil]

From: Hans Verkuil <hans.verkuil@cisco.com>

drivers/media/common/siano/smsdvb-main.c:47:5: warning: symbol 'sms_to_guard_interval_table' was not declared. Should it be static?
drivers/media/common/siano/smsdvb-main.c:54:5: warning: symbol 'sms_to_code_rate_table' was not declared. Should it be static?
drivers/media/common/siano/smsdvb-main.c:63:5: warning: symbol 'sms_to_hierarchy_table' was not declared. Should it be static?
drivers/media/common/siano/smsdvb-main.c:70:5: warning: symbol 'sms_to_modulation_table' was not declared. Should it be static?
drivers/media/common/siano/smscoreapi.c:925:35: warning: cast to restricted __le32
drivers/media/common/siano/smscoreapi.c:926:28: warning: cast to restricted __le32

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
---
 drivers/media/common/siano/smscoreapi.c  | 4 ++--
 drivers/media/common/siano/smsdvb-main.c | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c
index a142f79..9df2410 100644
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -922,8 +922,8 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev,
 	u32 i, *ptr;
 	u8 *payload = firmware->payload;
 	int rc = 0;
-	firmware->start_address = le32_to_cpu(firmware->start_address);
-	firmware->length = le32_to_cpu(firmware->length);
+	firmware->start_address = le32_to_cpup((__le32 *)&firmware->start_address);
+	firmware->length = le32_to_cpup((__le32 *)&firmware->length);
 
 	mem_address = firmware->start_address;
 
diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c
index 63676a8..85151ef 100644
--- a/drivers/media/common/siano/smsdvb-main.c
+++ b/drivers/media/common/siano/smsdvb-main.c
@@ -44,14 +44,14 @@ module_param_named(debug, sms_dbg, int, 0644);
 MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");
 
 
-u32 sms_to_guard_interval_table[] = {
+static u32 sms_to_guard_interval_table[] = {
 	[0] = GUARD_INTERVAL_1_32,
 	[1] = GUARD_INTERVAL_1_16,
 	[2] = GUARD_INTERVAL_1_8,
 	[3] = GUARD_INTERVAL_1_4,
 };
 
-u32 sms_to_code_rate_table[] = {
+static u32 sms_to_code_rate_table[] = {
 	[0] = FEC_1_2,
 	[1] = FEC_2_3,
 	[2] = FEC_3_4,
@@ -60,14 +60,14 @@ u32 sms_to_code_rate_table[] = {
 };
 
 
-u32 sms_to_hierarchy_table[] = {
+static u32 sms_to_hierarchy_table[] = {
 	[0] = HIERARCHY_NONE,
 	[1] = HIERARCHY_1,
 	[2] = HIERARCHY_2,
 	[3] = HIERARCHY_4,
 };
 
-u32 sms_to_modulation_table[] = {
+static u32 sms_to_modulation_table[] = {
 	[0] = QPSK,
 	[1] = QAM_16,
 	[2] = QAM_64,
-- 
1.8.3.2

Re: [PATCH 05/14] cxd2820r_core: fix sparse warnings

[Antti Palosaari]

On 04.10.2013 17:01, Hans Verkuil wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
>
> drivers/media/dvb-frontends/cxd2820r_core.c:34:32: error: cannot size expression
> drivers/media/dvb-frontends/cxd2820r_core.c:68:32: error: cannot size expression
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>


> Cc: Antti Palosaari <crope@iki.fi>
> ---
>   drivers/media/dvb-frontends/cxd2820r_core.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c b/drivers/media/dvb-frontends/cxd2820r_core.c
> index 7ca5c69..d9eeeb1 100644
> --- a/drivers/media/dvb-frontends/cxd2820r_core.c
> +++ b/drivers/media/dvb-frontends/cxd2820r_core.c
> @@ -31,7 +31,7 @@ static int cxd2820r_wr_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg,
>   		{
>   			.addr = i2c,
>   			.flags = 0,
> -			.len = sizeof(buf),
> +			.len = len + 1,
>   			.buf = buf,
>   		}
>   	};
> @@ -65,7 +65,7 @@ static int cxd2820r_rd_regs_i2c(struct cxd2820r_priv *priv, u8 i2c, u8 reg,
>   		}, {
>   			.addr = i2c,
>   			.flags = I2C_M_RD,
> -			.len = sizeof(buf),
> +			.len = len,
>   			.buf = buf,
>   		}
>   	};
>


-- 
http://palosaari.fi/

Re: [PATCH 07/14] drxk_hard: fix sparse warnings

[Antti Palosaari]

On 04.10.2013 17:01, Hans Verkuil wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
>
> drivers/media/dvb-frontends/drxk_hard.c:1086:62: warning: Using plain integer as NULL pointer
> drivers/media/dvb-frontends/drxk_hard.c:2784:63: warning: Using plain integer as NULL pointer
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

Reviewed-by: Antti Palosaari <crope@iki.fi>


> Cc: Antti Palosaari <crope@iki.fi>
> ---
>   drivers/media/dvb-frontends/drxk_hard.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
> index 082014d..d416c15 100644
> --- a/drivers/media/dvb-frontends/drxk_hard.c
> +++ b/drivers/media/dvb-frontends/drxk_hard.c
> @@ -1083,7 +1083,7 @@ static int hi_cfg_command(struct drxk_state *state)
>   			 SIO_HI_RA_RAM_PAR_1_PAR1_SEC_KEY);
>   	if (status < 0)
>   		goto error;
> -	status = hi_command(state, SIO_HI_RA_RAM_CMD_CONFIG, 0);
> +	status = hi_command(state, SIO_HI_RA_RAM_CMD_CONFIG, NULL);
>   	if (status < 0)
>   		goto error;
>
> @@ -2781,7 +2781,7 @@ static int ConfigureI2CBridge(struct drxk_state *state, bool b_enable_bridge)
>   			goto error;
>   	}
>
> -	status = hi_command(state, SIO_HI_RA_RAM_CMD_BRDCTRL, 0);
> +	status = hi_command(state, SIO_HI_RA_RAM_CMD_BRDCTRL, NULL);
>
>   error:
>   	if (status < 0)
>


-- 
http://palosaari.fi/

Re: [PATCH 06/14] drxd_hard: fix sparse warnings

[Antti Palosaari]

On 04.10.2013 17:01, Hans Verkuil wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
>
> drivers/media/dvb-frontends/drxd_hard.c:1017:70: warning: Using plain integer as NULL pointer
> drivers/media/dvb-frontends/drxd_hard.c:1038:69: warning: Using plain integer as NULL pointer
> drivers/media/dvb-frontends/drxd_hard.c:2836:33: warning: Using plain integer as NULL pointer
> drivers/media/dvb-frontends/drxd_hard.c:2972:30: warning: Using plain integer as NULL pointer
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

Reviewed-by: Antti Palosaari <crope@iki.fi>


> Cc: Antti Palosaari <crope@iki.fi>
> ---
>   drivers/media/dvb-frontends/drxd_hard.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/drxd_hard.c b/drivers/media/dvb-frontends/drxd_hard.c
> index cbd7c92..959ae36 100644
> --- a/drivers/media/dvb-frontends/drxd_hard.c
> +++ b/drivers/media/dvb-frontends/drxd_hard.c
> @@ -1014,7 +1014,7 @@ static int HI_CfgCommand(struct drxd_state *state)
>   		status = Write16(state, HI_RA_RAM_SRV_CMD__A,
>   				 HI_RA_RAM_SRV_CMD_CONFIG, 0);
>   	else
> -		status = HI_Command(state, HI_RA_RAM_SRV_CMD_CONFIG, 0);
> +		status = HI_Command(state, HI_RA_RAM_SRV_CMD_CONFIG, NULL);
>   	mutex_unlock(&state->mutex);
>   	return status;
>   }
> @@ -1035,7 +1035,7 @@ static int HI_ResetCommand(struct drxd_state *state)
>   	status = Write16(state, HI_RA_RAM_SRV_RST_KEY__A,
>   			 HI_RA_RAM_SRV_RST_KEY_ACT, 0);
>   	if (status == 0)
> -		status = HI_Command(state, HI_RA_RAM_SRV_CMD_RESET, 0);
> +		status = HI_Command(state, HI_RA_RAM_SRV_CMD_RESET, NULL);
>   	mutex_unlock(&state->mutex);
>   	msleep(1);
>   	return status;
> @@ -2833,7 +2833,7 @@ static int drxd_init(struct dvb_frontend *fe)
>   	int err = 0;
>
>   /*	if (request_firmware(&state->fw, "drxd.fw", state->dev)<0) */
> -	return DRXD_init(state, 0, 0);
> +	return DRXD_init(state, NULL, 0);
>
>   	err = DRXD_init(state, state->fw->data, state->fw->size);
>   	release_firmware(state->fw);
> @@ -2969,7 +2969,7 @@ struct dvb_frontend *drxd_attach(const struct drxd_config *config,
>
>   	mutex_init(&state->mutex);
>
> -	if (Read16(state, 0, 0, 0) < 0)
> +	if (Read16(state, 0, NULL, 0) < 0)
>   		goto error;
>
>   	state->frontend.ops = drxd_ops;
>


-- 
http://palosaari.fi/

Re: [PATCH 04/14] tuner-xs2028.c: fix sparse warnings

[Michael Krufky]

On Fri, Oct 4, 2013 at 10:01 AM, Hans Verkuil <hverkuil@xs4all.nl> wrote:
> From: Hans Verkuil <hans.verkuil@cisco.com>
>
> drivers/media/tuners/tuner-xc2028.c:575:24: warning: cast to restricted __le16
> drivers/media/tuners/tuner-xc2028.c:686:21: warning: cast to restricted __le16
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> Cc: Mauro Carvalho Chehab <m.chehab@samsung.com>
> ---
>  drivers/media/tuners/tuner-xc2028.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/tuners/tuner-xc2028.c b/drivers/media/tuners/tuner-xc2028.c
> index 878d2c4..e287a74 100644
> --- a/drivers/media/tuners/tuner-xc2028.c
> +++ b/drivers/media/tuners/tuner-xc2028.c
> @@ -572,7 +572,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
>                         return -EINVAL;
>                 }
>
> -               size = le16_to_cpu(*(__u16 *) p);
> +               size = le16_to_cpu(*(__le16 *) p);
>                 p += sizeof(size);
>
>                 if (size == 0xffff)
> @@ -683,7 +683,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
>                 /* 16 SCODE entries per file; each SCODE entry is 12 bytes and
>                  * has a 2-byte size header in the firmware format. */
>                 if (priv->firm[pos].size != 14 * 16 || scode >= 16 ||
> -                   le16_to_cpu(*(__u16 *)(p + 14 * scode)) != 12)
> +                   le16_to_cpu(*(__le16 *)(p + 14 * scode)) != 12)
>                         return -EINVAL;
>                 p += 14 * scode + 2;
>         }
> --
> 1.8.3.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reviewed-by: Michael Krufky <mkrufky@linuxtv.org>

Re: [PATCH 05/14] cxd2820r_core: fix sparse warnings

[Michael Krufky]

On Fri, Oct 4, 2013 at 10:36 AM, Antti Palosaari <crope@iki.fi> wrote:
> On 04.10.2013 17:01, Hans Verkuil wrote:
>>
>> From: Hans Verkuil <hans.verkuil@cisco.com>
>>
>> drivers/media/dvb-frontends/cxd2820r_core.c:34:32: error: cannot size
>> expression
>> drivers/media/dvb-frontends/cxd2820r_core.c:68:32: error: cannot size
>> expression
>>
>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
>
>
> Acked-by: Antti Palosaari <crope@iki.fi>
> Reviewed-by: Antti Palosaari <crope@iki.fi>
>
>
>
>> Cc: Antti Palosaari <crope@iki.fi>
>> ---
>>   drivers/media/dvb-frontends/cxd2820r_core.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/media/dvb-frontends/cxd2820r_core.c
>> b/drivers/media/dvb-frontends/cxd2820r_core.c
>> index 7ca5c69..d9eeeb1 100644
>> --- a/drivers/media/dvb-frontends/cxd2820r_core.c
>> +++ b/drivers/media/dvb-frontends/cxd2820r_core.c
>> @@ -31,7 +31,7 @@ static int cxd2820r_wr_regs_i2c(struct cxd2820r_priv
>> *priv, u8 i2c, u8 reg,
>>                 {
>>                         .addr = i2c,
>>                         .flags = 0,
>> -                       .len = sizeof(buf),
>> +                       .len = len + 1,
>>                         .buf = buf,
>>                 }
>>         };
>> @@ -65,7 +65,7 @@ static int cxd2820r_rd_regs_i2c(struct cxd2820r_priv
>> *priv, u8 i2c, u8 reg,
>>                 }, {
>>                         .addr = i2c,
>>                         .flags = I2C_M_RD,
>> -                       .len = sizeof(buf),
>> +                       .len = len,
>>                         .buf = buf,
>>                 }
>>         };
>>
>
>
> --
> http://palosaari.fi/
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reviewed-by: Michael Krufky <mkrufky@linuxtv.org>

Re: [PATCH 06/14] drxd_hard: fix sparse warnings

[Michael Krufky]

On Fri, Oct 4, 2013 at 10:44 AM, Antti Palosaari <crope@iki.fi> wrote:
> On 04.10.2013 17:01, Hans Verkuil wrote:
>>
>> From: Hans Verkuil <hans.verkuil@cisco.com>
>>
>> drivers/media/dvb-frontends/drxd_hard.c:1017:70: warning: Using plain
>> integer as NULL pointer
>> drivers/media/dvb-frontends/drxd_hard.c:1038:69: warning: Using plain
>> integer as NULL pointer
>> drivers/media/dvb-frontends/drxd_hard.c:2836:33: warning: Using plain
>> integer as NULL pointer
>> drivers/media/dvb-frontends/drxd_hard.c:2972:30: warning: Using plain
>> integer as NULL pointer
>>
>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
>
>
> Reviewed-by: Antti Palosaari <crope@iki.fi>
>
>
>
>> Cc: Antti Palosaari <crope@iki.fi>
>> ---
>>   drivers/media/dvb-frontends/drxd_hard.c | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/media/dvb-frontends/drxd_hard.c
>> b/drivers/media/dvb-frontends/drxd_hard.c
>> index cbd7c92..959ae36 100644
>> --- a/drivers/media/dvb-frontends/drxd_hard.c
>> +++ b/drivers/media/dvb-frontends/drxd_hard.c
>> @@ -1014,7 +1014,7 @@ static int HI_CfgCommand(struct drxd_state *state)
>>                 status = Write16(state, HI_RA_RAM_SRV_CMD__A,
>>                                  HI_RA_RAM_SRV_CMD_CONFIG, 0);
>>         else
>> -               status = HI_Command(state, HI_RA_RAM_SRV_CMD_CONFIG, 0);
>> +               status = HI_Command(state, HI_RA_RAM_SRV_CMD_CONFIG,
>> NULL);
>>         mutex_unlock(&state->mutex);
>>         return status;
>>   }
>> @@ -1035,7 +1035,7 @@ static int HI_ResetCommand(struct drxd_state *state)
>>         status = Write16(state, HI_RA_RAM_SRV_RST_KEY__A,
>>                          HI_RA_RAM_SRV_RST_KEY_ACT, 0);
>>         if (status == 0)
>> -               status = HI_Command(state, HI_RA_RAM_SRV_CMD_RESET, 0);
>> +               status = HI_Command(state, HI_RA_RAM_SRV_CMD_RESET, NULL);
>>         mutex_unlock(&state->mutex);
>>         msleep(1);
>>         return status;
>> @@ -2833,7 +2833,7 @@ static int drxd_init(struct dvb_frontend *fe)
>>         int err = 0;
>>
>>   /*    if (request_firmware(&state->fw, "drxd.fw", state->dev)<0) */
>> -       return DRXD_init(state, 0, 0);
>> +       return DRXD_init(state, NULL, 0);
>>
>>         err = DRXD_init(state, state->fw->data, state->fw->size);
>>         release_firmware(state->fw);
>> @@ -2969,7 +2969,7 @@ struct dvb_frontend *drxd_attach(const struct
>> drxd_config *config,
>>
>>         mutex_init(&state->mutex);
>>
>> -       if (Read16(state, 0, 0, 0) < 0)
>> +       if (Read16(state, 0, NULL, 0) < 0)
>>                 goto error;
>>
>>         state->frontend.ops = drxd_ops;
>>
>
>
> --
> http://palosaari.fi/
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reviewed-by: Michael Krufky <mkrufky@linuxtv.org>

Re: [PATCH 07/14] drxk_hard: fix sparse warnings

[Michael Krufky]

On Fri, Oct 4, 2013 at 10:40 AM, Antti Palosaari <crope@iki.fi> wrote:
> On 04.10.2013 17:01, Hans Verkuil wrote:
>>
>> From: Hans Verkuil <hans.verkuil@cisco.com>
>>
>> drivers/media/dvb-frontends/drxk_hard.c:1086:62: warning: Using plain
>> integer as NULL pointer
>> drivers/media/dvb-frontends/drxk_hard.c:2784:63: warning: Using plain
>> integer as NULL pointer
>>
>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
>
>
> Reviewed-by: Antti Palosaari <crope@iki.fi>
>
>
>
>> Cc: Antti Palosaari <crope@iki.fi>
>> ---
>>   drivers/media/dvb-frontends/drxk_hard.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/media/dvb-frontends/drxk_hard.c
>> b/drivers/media/dvb-frontends/drxk_hard.c
>> index 082014d..d416c15 100644
>> --- a/drivers/media/dvb-frontends/drxk_hard.c
>> +++ b/drivers/media/dvb-frontends/drxk_hard.c
>> @@ -1083,7 +1083,7 @@ static int hi_cfg_command(struct drxk_state *state)
>>                          SIO_HI_RA_RAM_PAR_1_PAR1_SEC_KEY);
>>         if (status < 0)
>>                 goto error;
>> -       status = hi_command(state, SIO_HI_RA_RAM_CMD_CONFIG, 0);
>> +       status = hi_command(state, SIO_HI_RA_RAM_CMD_CONFIG, NULL);
>>         if (status < 0)
>>                 goto error;
>>
>> @@ -2781,7 +2781,7 @@ static int ConfigureI2CBridge(struct drxk_state
>> *state, bool b_enable_bridge)
>>                         goto error;
>>         }
>>
>> -       status = hi_command(state, SIO_HI_RA_RAM_CMD_BRDCTRL, 0);
>> +       status = hi_command(state, SIO_HI_RA_RAM_CMD_BRDCTRL, NULL);
>>
>>   error:
>>         if (status < 0)
>>
>
>
> --
> http://palosaari.fi/
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reviewed-by: Michael Krufky <mkrufky@linuxtv.org>

Re: [PATCH 02/14] pvrusb2: fix sparse warning

[Mike Isely]

Acked-by: Mike Isely <isely@pobox.com>

  -Mike

On Fri, 4 Oct 2013, Hans Verkuil wrote:

> From: Hans Verkuil <hans.verkuil@cisco.com>
> 
> drivers/media/usb/pvrusb2/pvrusb2-hdw.c:2871:13: warning: symbol 'pvr2_hdw_get_detected_std' was not declared. Should it be static?
> 
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> Cc: Mike Isely <isely@pobox.com>
> ---
>  drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
> index c4d51d7..ea05f67 100644
> --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
> +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
> @@ -2868,7 +2868,7 @@ static void pvr2_subdev_set_control(struct pvr2_hdw *hdw, int id,
>  		pvr2_subdev_set_control(hdw, id, #lab, (hdw)->lab##_val); \
>  	}
>  
> -v4l2_std_id pvr2_hdw_get_detected_std(struct pvr2_hdw *hdw)
> +static v4l2_std_id pvr2_hdw_get_detected_std(struct pvr2_hdw *hdw)
>  {
>  	v4l2_std_id std;
>  	std = (v4l2_std_id)hdw->std_mask_avail;
> 

-- 

Mike Isely
isely @ isely (dot) net
PGP: 03 54 43 4D 75 E5 CC 92 71 16 01 E2 B5 F5 C1 E8