summaryrefslogtreecommitdiff
path: root/drivers/media/video
diff options
context:
space:
mode:
authorDarron Broad <darron@kewl.org>2008-10-15 20:26:34 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-17 17:29:59 -0300
commit96b7a1a838fb5b8746fc22f4ff3cef358bf59f35 (patch)
tree01262ee7ba5500fdd227ef87968cb401c2206b1a /drivers/media/video
parent745632147d54cd4db6812045351510ebd3981a24 (diff)
V4L/DVB (9271): videobuf: data storage optimisation (2)
To optimise data storage even further one other redundant var has been removed. This also removes a redundant assignment. Signed-off-by: Steven Toth <stoth@linuxtv.org> Signed-off-by: Darron Broad <darron@kewl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/cx23885/cx23885-dvb.c2
-rw-r--r--drivers/media/video/cx88/cx88-mpeg.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c2
-rw-r--r--drivers/media/video/videobuf-dvb.c7
4 files changed, 5 insertions, 8 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 8e9871106afa..e1aac07b3158 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -571,7 +571,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
port->num_frontends);
for (i = 1; i <= port->num_frontends; i++) {
- if (videobuf_dvb_alloc_frontend(dev,
+ if (videobuf_dvb_alloc_frontend(
&port->frontends, i) == NULL) {
printk(KERN_ERR "%s() failed to alloc\n", __func__);
return -ENOMEM;
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 512041451d38..6df5cf314186 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -807,7 +807,7 @@ static int __devinit cx8802_probe(struct pci_dev *pci_dev,
printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__, core->board.num_frontends);
for (i = 1; i <= core->board.num_frontends; i++) {
- demod = videobuf_dvb_alloc_frontend(dev, &dev->frontends, i);
+ demod = videobuf_dvb_alloc_frontend(&dev->frontends, i);
if(demod == NULL) {
printk(KERN_ERR "%s() failed to alloc\n", __func__);
err = -ENOMEM;
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 7d95a6928772..8c46115d4c79 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -958,7 +958,7 @@ static int dvb_init(struct saa7134_dev *dev)
printk(KERN_INFO "%s() allocating 1 frontend\n", __func__);
- if (videobuf_dvb_alloc_frontend(dev, &dev->frontends, 1) == NULL) {
+ if (videobuf_dvb_alloc_frontend(&dev->frontends, 1) == NULL) {
printk(KERN_ERR "%s() failed to alloc\n", __func__);
return -ENOMEM;
}
diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c
index 7c74845af267..36b1e67ac330 100644
--- a/drivers/media/video/videobuf-dvb.c
+++ b/drivers/media/video/videobuf-dvb.c
@@ -307,10 +307,8 @@ void videobuf_dvb_unregister_bus(struct videobuf_dvb_frontends *f)
dvb_dmx_release(&fe->dvb.demux);
dvb_unregister_frontend(fe->dvb.frontend);
}
- if(fe->dvb.frontend) { /* always allocated, may have been reset */
+ if(fe->dvb.frontend) /* always allocated, may have been reset */
dvb_frontend_detach(fe->dvb.frontend);
- fe->dvb.frontend = NULL;
- }
list_del(list);
kfree(fe);
}
@@ -360,7 +358,7 @@ int videobuf_dvb_find_frontend(struct videobuf_dvb_frontends *f, struct dvb_fron
return ret;
}
-struct videobuf_dvb_frontend * videobuf_dvb_alloc_frontend(void *private, struct videobuf_dvb_frontends *f, int id)
+struct videobuf_dvb_frontend * videobuf_dvb_alloc_frontend(struct videobuf_dvb_frontends *f, int id)
{
struct videobuf_dvb_frontend *fe;
@@ -368,7 +366,6 @@ struct videobuf_dvb_frontend * videobuf_dvb_alloc_frontend(void *private, struct
if (fe == NULL)
goto fail_alloc;
- fe->dev = private;
fe->id = id;
mutex_init(&fe->dvb.lock);