- tuner: switch to new module parameters.

- misc cleanups.

1 files changed, 26 insertions, 10 deletions

diff --git a/linux/drivers/media/video/video-buf-dvb.c b/linux/drivers/media/video/video-buf-dvb.c
index 51afc3ae5..e8eb03255 100644
--- a/linux/drivers/media/video/video-buf-dvb.c
+++ b/linux/drivers/media/video/video-buf-dvb.c
@@ -1,3 +1,19 @@
+/*
+ * $Id: video-buf-dvb.c,v 1.2 2004/10/20 09:43:34 kraxel Exp $
+ *
+ * some helper function for simple DVB cards which simply DMA the
+ * complete transport stream and let the computer sort everything else
+ * (i.e. we are using the software demux, ...).  Also uses the
+ * video-buf to manage DMA buffers.
+ *
+ * (c) 2004 Gerd Knorr <kraxel@bytesex.org> [SUSE Labs]
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -136,7 +152,7 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb)
 	if (result < 0) {
 		printk(KERN_WARNING "%s: dvb_dmx_init failed (errno = %d)\n",
 		       dvb->name, result);
-		goto fail1;
+		goto fail_dmx;
 	}
 
 	dvb->dmxdev.filternum    = 256;
@@ -146,7 +162,7 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb)
 	if (result < 0) {
 		printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n",
 		       dvb->name, result);
-		goto fail2;
+		goto fail_dmxdev;
 	}
 
 	dvb->fe_hw.source = DMX_FRONTEND_0;
@@ -154,7 +170,7 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb)
 	if (result < 0) {
 		printk(KERN_WARNING "%s: add_frontend failed (DMX_FRONTEND_0, errno = %d)\n",
 		       dvb->name, result);
-		goto fail3;
+		goto fail_fe_hw;
 	}
 
 	dvb->fe_mem.source = DMX_MEMORY_FE;
@@ -162,28 +178,28 @@ int videobuf_dvb_register(struct videobuf_dvb *dvb)
 	if (result < 0) {
 		printk(KERN_WARNING "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
 		       dvb->name, result);
-		goto fail4;
+		goto fail_fe_mem;
 	}
 
 	result = dvb->demux.dmx.connect_frontend(&dvb->demux.dmx, &dvb->fe_hw);
 	if (result < 0) {
 		printk(KERN_WARNING "%s: connect_frontend failed (errno = %d)\n",
 		       dvb->name, result);
-		goto fail5;
+		goto fail_fe_conn;
 	}
 
 	dvb_net_init(dvb->adapter, &dvb->net, &dvb->demux.dmx);
 	return 0;
 
-fail5:
+fail_fe_conn:
 	dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_mem);
-fail4:
+fail_fe_mem:
 	dvb->demux.dmx.remove_frontend(&dvb->demux.dmx, &dvb->fe_hw);
-fail3:
+fail_fe_hw:
 	dvb_dmxdev_release(&dvb->dmxdev);
-fail2:
+fail_dmxdev:
 	dvb_dmx_release(&dvb->demux);
-fail1:
+fail_dmx:
 	return result;
 }