* [PATCH 0/8] Fix sparse warnings/error
@ 2014-11-05 8:17 Hans Verkuil
2014-11-05 8:17 ` [PATCH 1/8] bttv: fix sparse warning Hans Verkuil
` (7 more replies)
0 siblings, 8 replies; 10+ messages in thread
From: Hans Verkuil @ 2014-11-05 8:17 UTC (permalink / raw)
To: linux-media
Another round of sparse fixes. After this there are two drivers that still
have a lot of warnings: cx88 (caused by a sparse bug, I've reported this on
the sparse mailinglist) and saa7164.
Regards,
Hans
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/8] bttv: fix sparse warning
2014-11-05 8:17 [PATCH 0/8] Fix sparse warnings/error Hans Verkuil
@ 2014-11-05 8:17 ` Hans Verkuil
2014-11-05 8:17 ` [PATCH 2/8] videobuf: fix sparse warnings Hans Verkuil
` (6 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2014-11-05 8:17 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
bttv-cards.c:3874:55: warning: incorrect type in initializer (different base types)
Also clean up the code a little by adding spaces.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/pci/bt8xx/bttv-cards.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c
index d8ec583..4105560 100644
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
@@ -3870,10 +3870,10 @@ static void osprey_eeprom(struct bttv *btv, const u8 ee[256])
} else {
unsigned short type;
- for (i = 4*16; i < 8*16; i += 16) {
- u16 checksum = ip_compute_csum(ee + i, 16);
+ for (i = 4 * 16; i < 8 * 16; i += 16) {
+ u16 checksum = (__force u16)ip_compute_csum(ee + i, 16);
- if ((checksum&0xff) + (checksum>>8) == 0xff)
+ if ((checksum & 0xff) + (checksum >> 8) == 0xff)
break;
}
if (i >= 8*16)
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/8] videobuf: fix sparse warnings
2014-11-05 8:17 [PATCH 0/8] Fix sparse warnings/error Hans Verkuil
2014-11-05 8:17 ` [PATCH 1/8] bttv: fix sparse warning Hans Verkuil
@ 2014-11-05 8:17 ` Hans Verkuil
2014-11-05 8:17 ` [PATCH 3/8] smipcie: " Hans Verkuil
` (5 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2014-11-05 8:17 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
videobuf-core.c:834:23: warning: Using plain integer as NULL pointer
videobuf-core.c:851:28: warning: Using plain integer as NULL pointer
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/v4l2-core/videobuf-core.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/media/v4l2-core/videobuf-core.c b/drivers/media/v4l2-core/videobuf-core.c
index b91a266..926836d 100644
--- a/drivers/media/v4l2-core/videobuf-core.c
+++ b/drivers/media/v4l2-core/videobuf-core.c
@@ -51,6 +51,8 @@ MODULE_LICENSE("GPL");
#define CALL(q, f, arg...) \
((q->int_ops->f) ? q->int_ops->f(arg) : 0)
+#define CALLPTR(q, f, arg...) \
+ ((q->int_ops->f) ? q->int_ops->f(arg) : NULL)
struct videobuf_buffer *videobuf_alloc_vb(struct videobuf_queue *q)
{
@@ -831,7 +833,7 @@ static int __videobuf_copy_to_user(struct videobuf_queue *q,
char __user *data, size_t count,
int nonblocking)
{
- void *vaddr = CALL(q, vaddr, buf);
+ void *vaddr = CALLPTR(q, vaddr, buf);
/* copy to userspace */
if (count > buf->size - q->read_off)
@@ -848,7 +850,7 @@ static int __videobuf_copy_stream(struct videobuf_queue *q,
char __user *data, size_t count, size_t pos,
int vbihack, int nonblocking)
{
- unsigned int *fc = CALL(q, vaddr, buf);
+ unsigned int *fc = CALLPTR(q, vaddr, buf);
if (vbihack) {
/* dirty, undocumented hack -- pass the frame counter
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/8] smipcie: fix sparse warnings
2014-11-05 8:17 [PATCH 0/8] Fix sparse warnings/error Hans Verkuil
2014-11-05 8:17 ` [PATCH 1/8] bttv: fix sparse warning Hans Verkuil
2014-11-05 8:17 ` [PATCH 2/8] videobuf: fix sparse warnings Hans Verkuil
@ 2014-11-05 8:17 ` Hans Verkuil
2014-11-05 8:17 ` [PATCH 4/8] sp2: " Hans Verkuil
` (4 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2014-11-05 8:17 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
smipcie.c:950:31: warning: Using plain integer as NULL pointer
smipcie.c:973:31: warning: Using plain integer as NULL pointer
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/pci/smipcie/smipcie.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/pci/smipcie/smipcie.c b/drivers/media/pci/smipcie/smipcie.c
index d1c1463..8dc6afa 100644
--- a/drivers/media/pci/smipcie/smipcie.c
+++ b/drivers/media/pci/smipcie/smipcie.c
@@ -947,7 +947,7 @@ err_del_i2c_adaptor:
err_pci_iounmap:
iounmap(dev->lmmio);
err_kfree:
- pci_set_drvdata(pdev, 0);
+ pci_set_drvdata(pdev, NULL);
kfree(dev);
err_pci_disable_device:
pci_disable_device(pdev);
@@ -970,7 +970,7 @@ static void smi_remove(struct pci_dev *pdev)
smi_i2c_exit(dev);
iounmap(dev->lmmio);
- pci_set_drvdata(pdev, 0);
+ pci_set_drvdata(pdev, NULL);
pci_disable_device(pdev);
kfree(dev);
}
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/8] sp2: fix sparse warnings
2014-11-05 8:17 [PATCH 0/8] Fix sparse warnings/error Hans Verkuil
` (2 preceding siblings ...)
2014-11-05 8:17 ` [PATCH 3/8] smipcie: " Hans Verkuil
@ 2014-11-05 8:17 ` Hans Verkuil
2014-11-05 9:14 ` Mauro Carvalho Chehab
2014-11-05 8:17 ` [PATCH 5/8] stk1160: fix sparse warning Hans Verkuil
` (3 subsequent siblings)
7 siblings, 1 reply; 10+ messages in thread
From: Hans Verkuil @ 2014-11-05 8:17 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
sp2.c:272:5: warning: symbol 'sp2_init' was not declared. Should it be static?
sp2.c:354:5: warning: symbol 'sp2_exit' was not declared. Should it be static?
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/dvb-frontends/sp2.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/dvb-frontends/sp2.c b/drivers/media/dvb-frontends/sp2.c
index 320cbe9..cc1ef96 100644
--- a/drivers/media/dvb-frontends/sp2.c
+++ b/drivers/media/dvb-frontends/sp2.c
@@ -269,7 +269,7 @@ int sp2_ci_poll_slot_status(struct dvb_ca_en50221 *en50221,
return s->status;
}
-int sp2_init(struct sp2 *s)
+static int sp2_init(struct sp2 *s)
{
int ret = 0;
u8 buf;
@@ -351,7 +351,7 @@ err:
return ret;
}
-int sp2_exit(struct i2c_client *client)
+static int sp2_exit(struct i2c_client *client)
{
struct sp2 *s;
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/8] stk1160: fix sparse warning
2014-11-05 8:17 [PATCH 0/8] Fix sparse warnings/error Hans Verkuil
` (3 preceding siblings ...)
2014-11-05 8:17 ` [PATCH 4/8] sp2: " Hans Verkuil
@ 2014-11-05 8:17 ` Hans Verkuil
2014-11-05 8:17 ` [PATCH 6/8] cxusb: fix sparse warnings Hans Verkuil
` (2 subsequent siblings)
7 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2014-11-05 8:17 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
stk1160-v4l.c:478:49: warning: incorrect type in argument 3 (different base types)
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/usb/stk1160/stk1160-v4l.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c
index 2330543..a476291 100644
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -475,7 +475,7 @@ static int vidioc_s_register(struct file *file, void *priv,
struct stk1160 *dev = video_drvdata(file);
/* Match host */
- return stk1160_write_reg(dev, reg->reg, cpu_to_le16(reg->val));
+ return stk1160_write_reg(dev, reg->reg, reg->val);
}
#endif
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/8] cxusb: fix sparse warnings
2014-11-05 8:17 [PATCH 0/8] Fix sparse warnings/error Hans Verkuil
` (4 preceding siblings ...)
2014-11-05 8:17 ` [PATCH 5/8] stk1160: fix sparse warning Hans Verkuil
@ 2014-11-05 8:17 ` Hans Verkuil
2014-11-05 8:17 ` [PATCH 7/8] s5p-mfc: fix sparse error Hans Verkuil
2014-11-05 8:17 ` [PATCH 8/8] ti-vpe: fix sparse warnings Hans Verkuil
7 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2014-11-05 8:17 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
cxusb.c:1443:32: warning: restricted __le16 degrades to integer
cxusb.c:1487:32: warning: restricted __le16 degrades to integer
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/usb/dvb-usb/cxusb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
index 8925b3946..b46f84d 100644
--- a/drivers/media/usb/dvb-usb/cxusb.c
+++ b/drivers/media/usb/dvb-usb/cxusb.c
@@ -1440,7 +1440,7 @@ static int cxusb_tt_ct2_4400_attach(struct dvb_usb_adapter *adap)
si2168_config.ts_mode = SI2168_TS_PARALLEL;
/* CT2-4400v2 TS gets corrupted without this */
- if (d->udev->descriptor.idProduct ==
+ if (le16_to_cpu(d->udev->descriptor.idProduct) ==
USB_PID_TECHNOTREND_TVSTICK_CT2_4400)
si2168_config.ts_mode |= 0x40;
@@ -1484,7 +1484,7 @@ static int cxusb_tt_ct2_4400_attach(struct dvb_usb_adapter *adap)
st->i2c_client_tuner = client_tuner;
/* initialize CI */
- if (d->udev->descriptor.idProduct ==
+ if (le16_to_cpu(d->udev->descriptor.idProduct) ==
USB_PID_TECHNOTREND_CONNECT_CT2_4650_CI) {
memcpy(o, "\xc0\x01", 2);
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 7/8] s5p-mfc: fix sparse error
2014-11-05 8:17 [PATCH 0/8] Fix sparse warnings/error Hans Verkuil
` (5 preceding siblings ...)
2014-11-05 8:17 ` [PATCH 6/8] cxusb: fix sparse warnings Hans Verkuil
@ 2014-11-05 8:17 ` Hans Verkuil
2014-11-05 8:17 ` [PATCH 8/8] ti-vpe: fix sparse warnings Hans Verkuil
7 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2014-11-05 8:17 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil, Kamil Debski
From: Hans Verkuil <hans.verkuil@cisco.com>
s5p_mfc_enc.c:1178:25: error: incompatible types in conditional expression (different base types)
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: Kamil Debski <k.debski@samsung.com>
---
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index 9391b8e..e7240cb 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -1175,7 +1175,7 @@ static int vidioc_reqbufs(struct file *file, void *priv,
if (reqbufs->count == 0) {
mfc_debug(2, "Freeing buffers\n");
ret = vb2_reqbufs(&ctx->vq_src, reqbufs);
- s5p_mfc_hw_call(dev->mfc_ops, release_codec_buffers,
+ s5p_mfc_hw_call_void(dev->mfc_ops, release_codec_buffers,
ctx);
ctx->output_state = QUEUE_FREE;
return ret;
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 8/8] ti-vpe: fix sparse warnings
2014-11-05 8:17 [PATCH 0/8] Fix sparse warnings/error Hans Verkuil
` (6 preceding siblings ...)
2014-11-05 8:17 ` [PATCH 7/8] s5p-mfc: fix sparse error Hans Verkuil
@ 2014-11-05 8:17 ` Hans Verkuil
7 siblings, 0 replies; 10+ messages in thread
From: Hans Verkuil @ 2014-11-05 8:17 UTC (permalink / raw)
To: linux-media; +Cc: Hans Verkuil
From: Hans Verkuil <hans.verkuil@cisco.com>
sc.c:303:26: warning: incorrect type in return expression (different address spaces)
csc.c:188:27: warning: incorrect type in return expression (different address spaces)
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
---
drivers/media/platform/ti-vpe/csc.c | 2 +-
drivers/media/platform/ti-vpe/sc.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/ti-vpe/csc.c
index 44fbf41..bec6749 100644
--- a/drivers/media/platform/ti-vpe/csc.c
+++ b/drivers/media/platform/ti-vpe/csc.c
@@ -185,7 +185,7 @@ struct csc_data *csc_create(struct platform_device *pdev)
csc->base = devm_ioremap_resource(&pdev->dev, csc->res);
if (IS_ERR(csc->base)) {
dev_err(&pdev->dev, "failed to ioremap\n");
- return csc->base;
+ return ERR_CAST(csc->base);
}
return csc;
diff --git a/drivers/media/platform/ti-vpe/sc.c b/drivers/media/platform/ti-vpe/sc.c
index 1088381..f82d1c7 100644
--- a/drivers/media/platform/ti-vpe/sc.c
+++ b/drivers/media/platform/ti-vpe/sc.c
@@ -300,7 +300,7 @@ struct sc_data *sc_create(struct platform_device *pdev)
sc->base = devm_ioremap_resource(&pdev->dev, sc->res);
if (IS_ERR(sc->base)) {
dev_err(&pdev->dev, "failed to ioremap\n");
- return sc->base;
+ return ERR_CAST(sc->base);
}
return sc;
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 4/8] sp2: fix sparse warnings
2014-11-05 8:17 ` [PATCH 4/8] sp2: " Hans Verkuil
@ 2014-11-05 9:14 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 10+ messages in thread
From: Mauro Carvalho Chehab @ 2014-11-05 9:14 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Hans Verkuil
Em Wed, 5 Nov 2014 09:17:48 +0100
Hans Verkuil <hverkuil@xs4all.nl> escreveu:
> From: Hans Verkuil <hans.verkuil@cisco.com>
>
> sp2.c:272:5: warning: symbol 'sp2_init' was not declared. Should it be static?
> sp2.c:354:5: warning: symbol 'sp2_exit' was not declared. Should it be static?
This one was fixed already (at fixes branch).
>
> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
> ---
> drivers/media/dvb-frontends/sp2.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/dvb-frontends/sp2.c b/drivers/media/dvb-frontends/sp2.c
> index 320cbe9..cc1ef96 100644
> --- a/drivers/media/dvb-frontends/sp2.c
> +++ b/drivers/media/dvb-frontends/sp2.c
> @@ -269,7 +269,7 @@ int sp2_ci_poll_slot_status(struct dvb_ca_en50221 *en50221,
> return s->status;
> }
>
> -int sp2_init(struct sp2 *s)
> +static int sp2_init(struct sp2 *s)
> {
> int ret = 0;
> u8 buf;
> @@ -351,7 +351,7 @@ err:
> return ret;
> }
>
> -int sp2_exit(struct i2c_client *client)
> +static int sp2_exit(struct i2c_client *client)
> {
> struct sp2 *s;
>
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-11-05 9:14 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-05 8:17 [PATCH 0/8] Fix sparse warnings/error Hans Verkuil
2014-11-05 8:17 ` [PATCH 1/8] bttv: fix sparse warning Hans Verkuil
2014-11-05 8:17 ` [PATCH 2/8] videobuf: fix sparse warnings Hans Verkuil
2014-11-05 8:17 ` [PATCH 3/8] smipcie: " Hans Verkuil
2014-11-05 8:17 ` [PATCH 4/8] sp2: " Hans Verkuil
2014-11-05 9:14 ` Mauro Carvalho Chehab
2014-11-05 8:17 ` [PATCH 5/8] stk1160: fix sparse warning Hans Verkuil
2014-11-05 8:17 ` [PATCH 6/8] cxusb: fix sparse warnings Hans Verkuil
2014-11-05 8:17 ` [PATCH 7/8] s5p-mfc: fix sparse error Hans Verkuil
2014-11-05 8:17 ` [PATCH 8/8] ti-vpe: fix sparse warnings Hans Verkuil
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.