* [PATCH] [media] pci: constify vb2_ops structures
@ 2016-09-08 23:59 Julia Lawall
2016-09-09 9:17 ` Andrey Utkin
0 siblings, 1 reply; 7+ messages in thread
From: Julia Lawall @ 2016-09-08 23:59 UTC (permalink / raw)
To: Ezequiel Garcia
Cc: kernel-janitors, Abylay Ospan, Sergey Kozlov,
Bluecherry Maintainers, Andrey Utkin, Ismael Luceno,
Mauro Carvalho Chehab, linux-media, linux-kernel, Hans Verkuil
Check for vb2_ops structures that are only stored in the ops field of a
vb2_queue structure. That field is declared const, so vb2_ops structures
that have this property can be declared as const also.
The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@r disable optional_qualifier@
identifier i;
position p;
@@
static struct vb2_ops i@p = { ... };
@ok@
identifier r.i;
struct vb2_queue e;
position p;
@@
e.ops = &i@p;
@bad@
position p != {r.p,ok.p};
identifier r.i;
struct vb2_ops e;
@@
e@i@p
@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
struct vb2_ops i = { ... };
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
drivers/media/pci/cx23885/cx23885-417.c | 2 +-
drivers/media/pci/cx23885/cx23885-dvb.c | 2 +-
drivers/media/pci/cx23885/cx23885-video.c | 2 +-
drivers/media/pci/cx25821/cx25821-video.c | 2 +-
drivers/media/pci/cx88/cx88-blackbird.c | 2 +-
drivers/media/pci/cx88/cx88-dvb.c | 2 +-
drivers/media/pci/cx88/cx88-video.c | 2 +-
drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +-
drivers/media/pci/saa7134/saa7134-empress.c | 2 +-
drivers/media/pci/saa7134/saa7134-video.c | 2 +-
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +-
drivers/media/pci/tw68/tw68-video.c | 2 +-
drivers/media/pci/tw686x/tw686x-video.c | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 3991643..25a2137 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -759,7 +759,7 @@ static void solo_enc_buf_finish(struct vb2_buffer *vb)
}
}
-static struct vb2_ops solo_enc_video_qops = {
+static const struct vb2_ops solo_enc_video_qops = {
.queue_setup = solo_enc_queue_setup,
.buf_queue = solo_enc_buf_queue,
.buf_finish = solo_enc_buf_finish,
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
index ac547cb..b078ac2 100644
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
@@ -353,7 +353,7 @@ static void netup_unidvb_stop_streaming(struct vb2_queue *q)
netup_unidvb_queue_cleanup(dma);
}
-static struct vb2_ops dvb_qops = {
+static const struct vb2_ops dvb_qops = {
.queue_setup = netup_unidvb_queue_setup,
.buf_prepare = netup_unidvb_buf_prepare,
.buf_queue = netup_unidvb_buf_queue,
diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index 04fe9af..b532e49 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -756,7 +756,7 @@ static void stop_streaming(struct vb2_queue *q)
spin_unlock_irqrestore(&dev->slock, flags);
}
-static struct vb2_ops blackbird_qops = {
+static const struct vb2_ops blackbird_qops = {
.queue_setup = queue_setup,
.buf_prepare = buffer_prepare,
.buf_finish = buffer_finish,
diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
index 5bb63e7..ac2392d 100644
--- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -156,7 +156,7 @@ static void stop_streaming(struct vb2_queue *q)
spin_unlock_irqrestore(&dev->slock, flags);
}
-static struct vb2_ops dvb_qops = {
+static const struct vb2_ops dvb_qops = {
.queue_setup = queue_setup,
.buf_prepare = buffer_prepare,
.buf_finish = buffer_finish,
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 5dc1e3f..d83eb3b 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -567,7 +567,7 @@ static void stop_streaming(struct vb2_queue *q)
spin_unlock_irqrestore(&dev->slock, flags);
}
-static struct vb2_ops cx8800_video_qops = {
+static const struct vb2_ops cx8800_video_qops = {
.queue_setup = queue_setup,
.buf_prepare = buffer_prepare,
.buf_finish = buffer_finish,
diff --git a/drivers/media/pci/tw686x/tw686x-video.c b/drivers/media/pci/tw686x/tw686x-video.c
index cdb16de..7339b9a 100644
--- a/drivers/media/pci/tw686x/tw686x-video.c
+++ b/drivers/media/pci/tw686x/tw686x-video.c
@@ -577,7 +577,7 @@ static int tw686x_buf_prepare(struct vb2_buffer *vb)
return 0;
}
-static struct vb2_ops tw686x_video_qops = {
+static const struct vb2_ops tw686x_video_qops = {
.queue_setup = tw686x_queue_setup,
.buf_queue = tw686x_buf_queue,
.buf_prepare = tw686x_buf_prepare,
diff --git a/drivers/media/pci/tw68/tw68-video.c b/drivers/media/pci/tw68/tw68-video.c
index 5e82128..a45e023 100644
--- a/drivers/media/pci/tw68/tw68-video.c
+++ b/drivers/media/pci/tw68/tw68-video.c
@@ -535,7 +535,7 @@ static void tw68_stop_streaming(struct vb2_queue *q)
}
}
-static struct vb2_ops tw68_video_qops = {
+static const struct vb2_ops tw68_video_qops = {
.queue_setup = tw68_queue_setup,
.buf_queue = tw68_buf_queue,
.buf_prepare = tw68_buf_prepare,
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c
index efec2d1..c95db4d 100644
--- a/drivers/media/pci/cx23885/cx23885-417.c
+++ b/drivers/media/pci/cx23885/cx23885-417.c
@@ -1223,7 +1223,7 @@ static void cx23885_stop_streaming(struct vb2_queue *q)
cx23885_cancel_buffers(&dev->ts1);
}
-static struct vb2_ops cx23885_qops = {
+static const struct vb2_ops cx23885_qops = {
.queue_setup = queue_setup,
.buf_prepare = buffer_prepare,
.buf_finish = buffer_finish,
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index e5748a9..2c5ec56 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -172,7 +172,7 @@ static void cx23885_stop_streaming(struct vb2_queue *q)
cx23885_cancel_buffers(port);
}
-static struct vb2_ops dvb_qops = {
+static const struct vb2_ops dvb_qops = {
.queue_setup = queue_setup,
.buf_prepare = buffer_prepare,
.buf_finish = buffer_finish,
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index 6d73522..33d168e 100644
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -517,7 +517,7 @@ static void cx23885_stop_streaming(struct vb2_queue *q)
spin_unlock_irqrestore(&dev->slock, flags);
}
-static struct vb2_ops cx23885_video_qops = {
+static const struct vb2_ops cx23885_video_qops = {
.queue_setup = queue_setup,
.buf_prepare = buffer_prepare,
.buf_finish = buffer_finish,
diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c
index adcd09b..7ce352a 100644
--- a/drivers/media/pci/cx25821/cx25821-video.c
+++ b/drivers/media/pci/cx25821/cx25821-video.c
@@ -307,7 +307,7 @@ static void cx25821_stop_streaming(struct vb2_queue *q)
spin_unlock_irqrestore(&dev->slock, flags);
}
-static struct vb2_ops cx25821_video_qops = {
+static const struct vb2_ops cx25821_video_qops = {
.queue_setup = cx25821_queue_setup,
.buf_prepare = cx25821_buffer_prepare,
.buf_finish = cx25821_buffer_finish,
diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
index ca417a4..b56b5f7 100644
--- a/drivers/media/pci/saa7134/saa7134-empress.c
+++ b/drivers/media/pci/saa7134/saa7134-empress.c
@@ -85,7 +85,7 @@ static void stop_streaming(struct vb2_queue *vq)
dev->empress_started = 0;
}
-static struct vb2_ops saa7134_empress_qops = {
+static const struct vb2_ops saa7134_empress_qops = {
.queue_setup = saa7134_ts_queue_setup,
.buf_init = saa7134_ts_buffer_init,
.buf_prepare = saa7134_ts_buffer_prepare,
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 8a6ebd0..12f3fde 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -1054,7 +1054,7 @@ void saa7134_vb2_stop_streaming(struct vb2_queue *vq)
pm_qos_remove_request(&dev->qos_request);
}
-static struct vb2_ops vb2_qops = {
+static const struct vb2_ops vb2_qops = {
.queue_setup = queue_setup,
.buf_init = buffer_init,
.buf_prepare = buffer_prepare,
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] [media] pci: constify vb2_ops structures
2016-09-08 23:59 [PATCH] [media] pci: constify vb2_ops structures Julia Lawall
@ 2016-09-09 9:17 ` Andrey Utkin
2016-09-09 9:34 ` Julia Lawall
2016-09-09 14:31 ` Julia Lawall
0 siblings, 2 replies; 7+ messages in thread
From: Andrey Utkin @ 2016-09-09 9:17 UTC (permalink / raw)
To: Julia Lawall
Cc: Ezequiel Garcia, kernel-janitors, Abylay Ospan, Sergey Kozlov,
Bluecherry Maintainers, Andrey Utkin, Ismael Luceno,
Mauro Carvalho Chehab, linux-media, linux-kernel, Hans Verkuil
On Fri, Sep 09, 2016 at 01:59:18AM +0200, Julia Lawall wrote:
> Check for vb2_ops structures that are only stored in the ops field of a
> vb2_queue structure. That field is declared const, so vb2_ops structures
> that have this property can be declared as const also.
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>
> ---
> drivers/media/pci/cx23885/cx23885-417.c | 2 +-
> drivers/media/pci/cx23885/cx23885-dvb.c | 2 +-
> drivers/media/pci/cx23885/cx23885-video.c | 2 +-
> drivers/media/pci/cx25821/cx25821-video.c | 2 +-
> drivers/media/pci/cx88/cx88-blackbird.c | 2 +-
> drivers/media/pci/cx88/cx88-dvb.c | 2 +-
> drivers/media/pci/cx88/cx88-video.c | 2 +-
> drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +-
> drivers/media/pci/saa7134/saa7134-empress.c | 2 +-
> drivers/media/pci/saa7134/saa7134-video.c | 2 +-
> drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +-
> drivers/media/pci/tw68/tw68-video.c | 2 +-
> drivers/media/pci/tw686x/tw686x-video.c | 2 +-
> 13 files changed, 13 insertions(+), 13 deletions(-)
Applies and compiles cleanly on media tree.
But please regenerate this patch on git://linuxtv.org/media_tree.git -
it has a new driver by me, drivers/media/pci/tw5864 , which is affected.
Otherwise
Acked-by: Andrey Utkin <andrey.utkin@corp.bluecherry.net>
(however this time I'm writing from another email.)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [media] pci: constify vb2_ops structures
2016-09-09 9:17 ` Andrey Utkin
@ 2016-09-09 9:34 ` Julia Lawall
2016-09-09 10:02 ` andrey_utkin
2016-09-09 14:31 ` Julia Lawall
1 sibling, 1 reply; 7+ messages in thread
From: Julia Lawall @ 2016-09-09 9:34 UTC (permalink / raw)
To: Andrey Utkin
Cc: Ezequiel Garcia, kernel-janitors, Abylay Ospan, Sergey Kozlov,
Bluecherry Maintainers, Andrey Utkin, Ismael Luceno,
Mauro Carvalho Chehab, linux-media, linux-kernel, Hans Verkuil,
kernel-janitors-owner
Le 09.09.2016 17:17, Andrey Utkin a écrit :
> On Fri, Sep 09, 2016 at 01:59:18AM +0200, Julia Lawall wrote:
>> Check for vb2_ops structures that are only stored in the ops field of
>> a
>> vb2_queue structure. That field is declared const, so vb2_ops
>> structures
>> that have this property can be declared as const also.
>
>> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>>
>> ---
>> drivers/media/pci/cx23885/cx23885-417.c | 2 +-
>> drivers/media/pci/cx23885/cx23885-dvb.c | 2 +-
>> drivers/media/pci/cx23885/cx23885-video.c | 2 +-
>> drivers/media/pci/cx25821/cx25821-video.c | 2 +-
>> drivers/media/pci/cx88/cx88-blackbird.c | 2 +-
>> drivers/media/pci/cx88/cx88-dvb.c | 2 +-
>> drivers/media/pci/cx88/cx88-video.c | 2 +-
>> drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +-
>> drivers/media/pci/saa7134/saa7134-empress.c | 2 +-
>> drivers/media/pci/saa7134/saa7134-video.c | 2 +-
>> drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +-
>> drivers/media/pci/tw68/tw68-video.c | 2 +-
>> drivers/media/pci/tw686x/tw686x-video.c | 2 +-
>> 13 files changed, 13 insertions(+), 13 deletions(-)
>
> Applies and compiles cleanly on media tree.
> But please regenerate this patch on git://linuxtv.org/media_tree.git -
> it has a new driver by me, drivers/media/pci/tw5864 , which is
> affected.
Do you want the whole patch again, or would a patch on the new driver by
itself be sufficient? The changes in the different files are all
independent.
julia
> Otherwise
>
> Acked-by: Andrey Utkin <andrey.utkin@corp.bluecherry.net>
>
> (however this time I'm writing from another email.)
> --
> To unsubscribe from this list: send the line "unsubscribe
> kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [media] pci: constify vb2_ops structures
2016-09-09 9:34 ` Julia Lawall
@ 2016-09-09 10:02 ` andrey_utkin
0 siblings, 0 replies; 7+ messages in thread
From: andrey_utkin @ 2016-09-09 10:02 UTC (permalink / raw)
To: Julia Lawall
Cc: Ezequiel Garcia, kernel-janitors, Abylay Ospan, Sergey Kozlov,
Bluecherry Maintainers, Andrey Utkin, Ismael Luceno,
Mauro Carvalho Chehab, linux-media, linux-kernel, Hans Verkuil,
kernel-janitors-owner
On 9 September 2016 12:34:57 EEST, Julia Lawall <Julia.Lawall@lip6.fr> wrote:
>Do you want the whole patch again, or would a patch on the new driver
>by itself be sufficient? The changes in the different files are all
>independent.
I guess maintainers would want a single patch for everything in this
case. But don't take my word, ask/look what they say.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [media] pci: constify vb2_ops structures
2016-09-09 9:17 ` Andrey Utkin
2016-09-09 9:34 ` Julia Lawall
@ 2016-09-09 14:31 ` Julia Lawall
2016-09-09 15:07 ` Andrey Utkin
1 sibling, 1 reply; 7+ messages in thread
From: Julia Lawall @ 2016-09-09 14:31 UTC (permalink / raw)
To: Andrey Utkin
Cc: Ezequiel Garcia, kernel-janitors, Abylay Ospan, Sergey Kozlov,
Bluecherry Maintainers, Andrey Utkin, Ismael Luceno,
Mauro Carvalho Chehab, linux-media, linux-kernel, Hans Verkuil
On Fri, 9 Sep 2016, Andrey Utkin wrote:
> On Fri, Sep 09, 2016 at 01:59:18AM +0200, Julia Lawall wrote:
> > Check for vb2_ops structures that are only stored in the ops field of a
> > vb2_queue structure. That field is declared const, so vb2_ops structures
> > that have this property can be declared as const also.
>
> > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> >
> > ---
> > drivers/media/pci/cx23885/cx23885-417.c | 2 +-
> > drivers/media/pci/cx23885/cx23885-dvb.c | 2 +-
> > drivers/media/pci/cx23885/cx23885-video.c | 2 +-
> > drivers/media/pci/cx25821/cx25821-video.c | 2 +-
> > drivers/media/pci/cx88/cx88-blackbird.c | 2 +-
> > drivers/media/pci/cx88/cx88-dvb.c | 2 +-
> > drivers/media/pci/cx88/cx88-video.c | 2 +-
> > drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +-
> > drivers/media/pci/saa7134/saa7134-empress.c | 2 +-
> > drivers/media/pci/saa7134/saa7134-video.c | 2 +-
> > drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 2 +-
> > drivers/media/pci/tw68/tw68-video.c | 2 +-
> > drivers/media/pci/tw686x/tw686x-video.c | 2 +-
> > 13 files changed, 13 insertions(+), 13 deletions(-)
>
> Applies and compiles cleanly on media tree.
> But please regenerate this patch on git://linuxtv.org/media_tree.git -
> it has a new driver by me, drivers/media/pci/tw5864 , which is affected.
Will this soon reach linux-next?
julia
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [media] pci: constify vb2_ops structures
2016-09-09 14:31 ` Julia Lawall
@ 2016-09-09 15:07 ` Andrey Utkin
2016-09-09 15:23 ` Julia Lawall
0 siblings, 1 reply; 7+ messages in thread
From: Andrey Utkin @ 2016-09-09 15:07 UTC (permalink / raw)
To: Julia Lawall
Cc: Ezequiel Garcia, kernel-janitors, Abylay Ospan, Sergey Kozlov,
Bluecherry Maintainers, Andrey Utkin, Ismael Luceno,
Mauro Carvalho Chehab, linux-media, linux-kernel, Hans Verkuil
On Fri, Sep 09, 2016 at 10:31:30PM +0800, Julia Lawall wrote:
> Will this soon reach linux-next?
No idea. Indeed it's simpler if you leave your patch as is, and then
later we patch this new driver separately.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] [media] pci: constify vb2_ops structures
2016-09-09 15:07 ` Andrey Utkin
@ 2016-09-09 15:23 ` Julia Lawall
0 siblings, 0 replies; 7+ messages in thread
From: Julia Lawall @ 2016-09-09 15:23 UTC (permalink / raw)
To: Andrey Utkin
Cc: Ezequiel Garcia, kernel-janitors, Abylay Ospan, Sergey Kozlov,
Bluecherry Maintainers, Andrey Utkin, Ismael Luceno,
Mauro Carvalho Chehab, linux-media, linux-kernel, Hans Verkuil
On Fri, 9 Sep 2016, Andrey Utkin wrote:
> On Fri, Sep 09, 2016 at 10:31:30PM +0800, Julia Lawall wrote:
> > Will this soon reach linux-next?
>
> No idea. Indeed it's simpler if you leave your patch as is, and then
> later we patch this new driver separately.
OK, thanks.
julia
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-09-09 15:23 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-08 23:59 [PATCH] [media] pci: constify vb2_ops structures Julia Lawall
2016-09-09 9:17 ` Andrey Utkin
2016-09-09 9:34 ` Julia Lawall
2016-09-09 10:02 ` andrey_utkin
2016-09-09 14:31 ` Julia Lawall
2016-09-09 15:07 ` Andrey Utkin
2016-09-09 15:23 ` Julia Lawall
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).