add "DVB: " prefix to kernel boot messages

4 files changed, 12 insertions, 11 deletions

diff --git a/linux/drivers/media/dvb/av7110/av7110.c b/linux/drivers/media/dvb/av7110/av7110.c
index e7e536092..dae63228b 100644
--- a/linux/drivers/media/dvb/av7110/av7110.c
+++ b/linux/drivers/media/dvb/av7110/av7110.c
@@ -2018,8 +2018,8 @@ firmversion(av7110_t *av7110)
         av7110->arm_app=(buf[6] << 16) + buf[7];
         av7110->avtype=(buf[8] << 16) + buf[9];
 
-        printk ("av7110 (%d): AV711%d - firm %08x, rtsl %08x, vid %08x, app %08x\n", 
-		av7110->saa->dvb_adapter->num, av7110->avtype, av7110->arm_fw, 
+        printk ("DVB: AV711%d(%d) - firm %08x, rtsl %08x, vid %08x, app %08x\n",
+		av7110->avtype, av7110->saa->dvb_adapter->num, av7110->arm_fw, 
                 av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app);
 
         return;
diff --git a/linux/drivers/media/dvb/av7110/saa7146_core.c b/linux/drivers/media/dvb/av7110/saa7146_core.c
index 4469d3a86..1eb261e9a 100644
--- a/linux/drivers/media/dvb/av7110/saa7146_core.c
+++ b/linux/drivers/media/dvb/av7110/saa7146_core.c
@@ -389,9 +389,9 @@ static int saa7146_core_command (struct dvb_i2c_bus *i2c, unsigned int cmd, void
 		
 			struct saa7146_debi_transfer *dt = arg;
 
-			printk("saa7146_core.o: SAA7146_DEBI_TRANSFER\n");
-			printk("saa7146_core.o: timeout:%d, swap:%d, slave16:%d, increment:%d, intel:%d, tien:%d\n", dt->timeout, dt->swap, dt->slave16, dt->increment, dt->intel, dt->tien);
-			printk("saa7146_core.o: address:0x%04x, num_bytes:%d, direction:%d, mem:0x%08x\n",dt->address,dt->address,dt->direction,dt->mem);						
+			dprintk("saa7146_core.o: SAA7146_DEBI_TRANSFER\n");
+			dprintk("saa7146_core.o: timeout:%d, swap:%d, slave16:%d, increment:%d, intel:%d, tien:%d\n", dt->timeout, dt->swap, dt->slave16, dt->increment, dt->intel, dt->tien);
+			dprintk("saa7146_core.o: address:0x%04x, num_bytes:%d, direction:%d, mem:0x%08x\n",dt->address,dt->address,dt->direction,dt->mem);						
 
 			debi_transfer(saa, dt);
 			break;
@@ -622,7 +622,7 @@ int configure_saa7146 (struct saa7146 *saa)
 	}
 	
 	/* print status message */
-    	printk(KERN_ERR "saa7146_core.o: %s: bus:%d, rev:%d, mem:0x%08x.\n", saa->name, saa->device->bus->number, saa->revision, (unsigned int) saa->mem);
+    	dprintk("saa7146_core.o: %s: bus:%d, rev:%d, mem:0x%08x.\n", saa->name, saa->device->bus->number, saa->revision, (unsigned int) saa->mem);
 
 	/* enable bus-mastering */
  	pci_set_master( saa->device );
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
index 10646a472..ca25535a4 100644
--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -367,7 +367,7 @@ void dvb_frontend_init (struct dvb_frontend_data *fe)
 	struct dvb_frontend *frontend = &fe->frontend;
 	struct dvb_frontend_parameters *init_param;
 
-	printk ("%s: initialising frontend %i:%i (%s)...\n", __FUNCTION__,
+	printk ("DVB: initialising frontend %i:%i (%s)...\n",
 		frontend->i2c->adapter->num, frontend->i2c->id,
 		fe->info->name);
 
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c
index 090236858..27a45beef 100644
--- a/linux/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c
@@ -37,6 +37,7 @@
 #include <asm/system.h>
 #include <linux/kmod.h>
 #include <linux/slab.h>
+#include <linux/videodev.h>
 
 #include "compat.h"
 #include "dvbdev.h"
@@ -239,9 +240,9 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
 					      S_IFCHR | S_IRUSR | S_IWUSR,
 					      dvbdev->fops, dvbdev);
 
-	dprintk("%s: register adapter%d/%s @ minor: %i (0x%02x) - dvbdev: %p\n",
-		__FUNCTION__, adap->num, name, nums2minor(adap->num, type, id),
-		nums2minor(adap->num, type, id), dvbdev);
+	dprintk("DVB: register adapter%d/%s @ minor: %i (0x%02x)\n",
+		adap->num, name, nums2minor(adap->num, type, id),
+		nums2minor(adap->num, type, id));
 
 	return 0;
 }
@@ -304,7 +305,7 @@ int dvb_register_adapter(struct dvb_adapter **padap, char *name)
 
 	MOD_INC_USE_COUNT;
 
-	printk ("%s: registering new adapter (%s).\n", __FUNCTION__, name);
+	printk ("DVB: registering new adapter (%s).\n", name);
 	
 	sprintf(dirname, "adapter%d", num);
 	adap->devfs_handle = devfs_mk_dir(dvb_devfs_handle, dirname, NULL);