The patch number 9273 was added via Steven Toth <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Steven Toth <[EMAIL PROTECTED]>
MFE: videobuf-dvb.c checkpatch cleanup as part of MFE merge
MFE: videobuf-dvb.c checkpatch cleanup as part of MFE merge
Priority: normal
Signed-off-by: Steven Toth <[EMAIL PROTECTED]>
---
linux/drivers/media/video/videobuf-dvb.c | 49 +++++++++++++----------
1 file changed, 28 insertions(+), 21 deletions(-)
diff -r 3bd0023d43f6 -r efae176c5df8 linux/drivers/media/video/videobuf-dvb.c
--- a/linux/drivers/media/video/videobuf-dvb.c Mon Oct 13 17:23:49 2008 -0400
+++ b/linux/drivers/media/video/videobuf-dvb.c Thu Oct 16 20:42:10 2008 -0400
@@ -131,7 +131,6 @@ static int videobuf_dvb_stop_feed(struct
mutex_lock(&dvb->lock);
dvb->nfeeds--;
if (0 == dvb->nfeeds && NULL != dvb->thread) {
- // FIXME: cx8802_cancel_buffers(dev);
err = kthread_stop(dvb->thread);
dvb->thread = NULL;
}
@@ -159,7 +158,8 @@ int videobuf_dvb_register_bus(struct vid
}
/* Bring up the adapter */
- res = videobuf_dvb_register_adapter(f, module, adapter_priv, device,
fe->dvb.name, adapter_nr, mfe_shared);
+ res = videobuf_dvb_register_adapter(f, module, adapter_priv, device,
+ fe->dvb.name, adapter_nr, mfe_shared);
if (res < 0) {
printk(KERN_WARNING "videobuf_dvb_register_adapter failed
(errno = %d)\n", res);
return res;
@@ -184,6 +184,7 @@ err:
videobuf_dvb_unregister_bus(f);
return res;
}
+EXPORT_SYMBOL(videobuf_dvb_register_bus);
int videobuf_dvb_register_adapter(struct videobuf_dvb_frontends *fe,
struct module *module,
@@ -198,7 +199,8 @@ int videobuf_dvb_register_adapter(struct
mutex_init(&fe->lock);
/* register adapter */
- result = dvb_register_adapter(&fe->adapter, adapter_name, module,
device, adapter_nr);
+ result = dvb_register_adapter(&fe->adapter, adapter_name, module,
+ device, adapter_nr);
if (result < 0) {
printk(KERN_WARNING "%s: dvb_register_adapter failed (errno =
%d)\n",
adapter_name, result);
@@ -209,7 +211,8 @@ int videobuf_dvb_register_adapter(struct
return result;
}
-int videobuf_dvb_register_frontend(struct dvb_adapter *adapter, struct
videobuf_dvb *dvb)
+int videobuf_dvb_register_frontend(struct dvb_adapter *adapter,
+ struct videobuf_dvb *dvb)
{
int result;
@@ -304,15 +307,18 @@ void videobuf_dvb_unregister_bus(struct
mutex_lock(&f->lock);
list_for_each_safe(list, q, &f->felist) {
fe = list_entry(list, struct videobuf_dvb_frontend, felist);
- if(fe->dvb.net.dvbdev) {
+ if (fe->dvb.net.dvbdev) {
dvb_net_release(&fe->dvb.net);
- fe->dvb.demux.dmx.remove_frontend(&fe->dvb.demux.dmx,
&fe->dvb.fe_mem);
- fe->dvb.demux.dmx.remove_frontend(&fe->dvb.demux.dmx,
&fe->dvb.fe_hw);
+ fe->dvb.demux.dmx.remove_frontend(&fe->dvb.demux.dmx,
+ &fe->dvb.fe_mem);
+ fe->dvb.demux.dmx.remove_frontend(&fe->dvb.demux.dmx,
+ &fe->dvb.fe_hw);
dvb_dmxdev_release(&fe->dvb.dmxdev);
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);
list_del(list);
kfree(fe);
@@ -321,8 +327,10 @@ void videobuf_dvb_unregister_bus(struct
dvb_unregister_adapter(&f->adapter);
}
-
-struct videobuf_dvb_frontend * videobuf_dvb_get_frontend(struct
videobuf_dvb_frontends *f, int id)
+EXPORT_SYMBOL(videobuf_dvb_unregister_bus);
+
+struct videobuf_dvb_frontend *videobuf_dvb_get_frontend(
+ struct videobuf_dvb_frontends *f, int id)
{
struct list_head *list, *q;
struct videobuf_dvb_frontend *fe, *ret = NULL;
@@ -341,8 +349,10 @@ struct videobuf_dvb_frontend * videobuf_
return ret;
}
-
-int videobuf_dvb_find_frontend(struct videobuf_dvb_frontends *f, struct
dvb_frontend *p)
+EXPORT_SYMBOL(videobuf_dvb_get_frontend);
+
+int videobuf_dvb_find_frontend(struct videobuf_dvb_frontends *f,
+ struct dvb_frontend *p)
{
struct list_head *list, *q;
struct videobuf_dvb_frontend *fe = NULL;
@@ -362,12 +372,14 @@ int videobuf_dvb_find_frontend(struct vi
return ret;
}
-
-struct videobuf_dvb_frontend * videobuf_dvb_alloc_frontend(struct
videobuf_dvb_frontends *f, int id)
+EXPORT_SYMBOL(videobuf_dvb_find_frontend);
+
+struct videobuf_dvb_frontend *videobuf_dvb_alloc_frontend(
+ struct videobuf_dvb_frontends *f, int id)
{
struct videobuf_dvb_frontend *fe;
- fe = kzalloc(sizeof(struct videobuf_dvb_frontend),GFP_KERNEL);
+ fe = kzalloc(sizeof(struct videobuf_dvb_frontend), GFP_KERNEL);
if (fe == NULL)
goto fail_alloc;
@@ -375,18 +387,13 @@ struct videobuf_dvb_frontend * videobuf_
mutex_init(&fe->dvb.lock);
mutex_lock(&f->lock);
- list_add_tail(&fe->felist,&f->felist);
+ list_add_tail(&fe->felist, &f->felist);
mutex_unlock(&f->lock);
fail_alloc:
return fe;
}
-
-EXPORT_SYMBOL(videobuf_dvb_register_bus);
-EXPORT_SYMBOL(videobuf_dvb_unregister_bus);
EXPORT_SYMBOL(videobuf_dvb_alloc_frontend);
-EXPORT_SYMBOL(videobuf_dvb_get_frontend);
-EXPORT_SYMBOL(videobuf_dvb_find_frontend);
/* ------------------------------------------------------------------ */
/*
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/efae176c5df8d93fd537ec82f03fbdd28871cdb3
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
