diff --git a/drivers/staging/media/av7110/av7110.c b/drivers/staging/media/av7110/av7110.c
index 30e2e6e65..728b3892a 100644
--- a/drivers/staging/media/av7110/av7110.c
+++ b/drivers/staging/media/av7110/av7110.c
@@ -119,27 +119,27 @@ static void init_av7110_av(struct av7110 *av7110)
 	av7110->adac_type = DVB_ADAC_TI;
 	ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
 	if (ret < 0)
-		printk("dvb-ttpci:cannot set internal volume to maximum:%d\n",ret);
+		pr_err("cannot set internal volume to maximum:%d\n", ret);

 	ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetMonitorType,
 			    1, (u16)av7110->display_ar);
 	if (ret < 0)
-		printk("dvb-ttpci: unable to set aspect ratio\n");
+		pr_err("unable to set aspect ratio\n");
 	ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetPanScanType,
 			    1, av7110->display_panscan);
 	if (ret < 0)
-		printk("dvb-ttpci: unable to set pan scan\n");
+		pr_err("unable to set pan scan\n");

 	ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 2, 2, wss_cfg_4_3);
 	if (ret < 0)
-		printk("dvb-ttpci: unable to configure 4:3 wss\n");
+		pr_err("unable to configure 4:3 wss\n");
 	ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, SetWSSConfig, 2, 3, wss_cfg_16_9);
 	if (ret < 0)
-		printk("dvb-ttpci: unable to configure 16:9 wss\n");
+		pr_err("unable to configure 16:9 wss\n");

 	ret = av7710_set_video_mode(av7110, vidmode);
 	if (ret < 0)
-		printk("dvb-ttpci:cannot set video mode:%d\n",ret);
+		pr_err("cannot set video mode:%d\n", ret);

 	/* handle different card types */
 	/* remaining inits according to card and frontend type */
@@ -148,8 +148,7 @@ static void init_av7110_av(struct av7110 *av7110)
 	if (dev->pci->subsystem_vendor == 0x13c2 && dev->pci->subsystem_device == 0x000a)
 		av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 0); // SPDIF on
 	if (i2c_writereg(av7110, 0x20, 0x00, 0x00) == 1) {
-		printk ("dvb-ttpci: Crystal audio DAC @ card %d detected\n",
-			av7110->dvb_adapter.num);
+		pr_info("Crystal audio DAC @ card %d detected\n", av7110->dvb_adapter.num);
 		av7110->adac_type = DVB_ADAC_CRYSTAL;
 		i2c_writereg(av7110, 0x20, 0x01, 0xd2);
 		i2c_writereg(av7110, 0x20, 0x02, 0x49);
@@ -162,23 +161,21 @@ static void init_av7110_av(struct av7110 *av7110)
 	} else if (av7110_init_analog_module(av7110) == 0) {
 		/* done. */
 	} else if (dev->pci->subsystem_vendor == 0x110a) {
-		printk("dvb-ttpci: DVB-C w/o analog module @ card %d detected\n",
-			av7110->dvb_adapter.num);
+		pr_info("DVB-C w/o analog module @ card %d detected\n", av7110->dvb_adapter.num);
 		av7110->adac_type = DVB_ADAC_NONE;
 	} else {
 		av7110->adac_type = adac;
-		printk("dvb-ttpci: adac type set to %d @ card %d\n",
-			av7110->adac_type, av7110->dvb_adapter.num);
+		pr_info("adac type set to %d @ card %d\n", av7110->adac_type, av7110->dvb_adapter.num);
 	}

 	if (av7110->adac_type == DVB_ADAC_NONE || av7110->adac_type == DVB_ADAC_MSP34x0) {
 		// switch DVB SCART on
 		ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, MainSwitch, 1, 0);
 		if (ret < 0)
-			printk("dvb-ttpci:cannot switch on SCART(Main):%d\n",ret);
+			pr_err("cannot switch on SCART(Main):%d\n", ret);
 		ret = av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, ADSwitch, 1, 1);
 		if (ret < 0)
-			printk("dvb-ttpci:cannot switch on SCART(AD):%d\n",ret);
+			pr_err("cannot switch on SCART(AD):%d\n", ret);
 		if (rgb_on &&
 		    ((av7110->dev->pci->subsystem_vendor == 0x110a) ||
 		     (av7110->dev->pci->subsystem_vendor == 0x13c2)) &&
@@ -193,12 +190,12 @@ static void init_av7110_av(struct av7110 *av7110)

 	ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right);
 	if (ret < 0)
-		printk("dvb-ttpci:cannot set volume :%d\n",ret);
+		pr_err("cannot set volume :%d\n", ret);
 }

 static void recover_arm(struct av7110 *av7110)
 {
-	dprintk(4, "%p\n",av7110);
+	dprintk(4, "%p\n", av7110);

 	av7110_bootarm(av7110);
 	msleep(100);
@@ -230,7 +227,7 @@ static int arm_thread(void *data)
 	u16 newloops = 0;
 	int timeout;

-	dprintk(4, "%p\n",av7110);
+	dprintk(4, "%p\n", av7110);

 	for (;;) {
 		timeout = wait_event_interruptible_timeout(av7110->arm_wait,
@@ -250,8 +247,7 @@ static int arm_thread(void *data)
 		mutex_unlock(&av7110->dcomlock);

 		if (newloops == av7110->arm_loops || av7110->arm_errors > 3) {
-			printk(KERN_ERR "dvb-ttpci: ARM crashed @ card %d\n",
-			       av7110->dvb_adapter.num);
+			pr_err("ARM crashed @ card %d\n", av7110->dvb_adapter.num);

 			recover_arm(av7110);

@@ -325,7 +321,7 @@ static inline void print_time(char *s)
 	struct timespec64 ts;

 	ktime_get_real_ts64(&ts);
-	printk("%s: %lld.%09ld\n", s, (s64)ts.tv_sec, ts.tv_nsec);
+	pr_info("%s(): %lld.%09ld\n", s, (s64)ts.tv_sec, ts.tv_nsec);
 #endif
 }

@@ -336,7 +332,7 @@ static inline void start_debi_dma(struct av7110 *av7110, int dir,
 {
 	dprintk(8, "%c %08lx %u\n", dir == DEBI_READ ? 'R' : 'W', addr, len);
 	if (saa7146_wait_for_debi_done(av7110->dev, 0)) {
-		printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __func__);
+		pr_err("%s(): saa7146_wait_for_debi_done timed out\n", __func__);
 		return;
 	}

@@ -361,9 +357,8 @@ static void debiirq(struct tasklet_struct *t)
 	dprintk(4, "type 0x%04x\n", type);

 	if (type == -1) {
-		printk("DEBI irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n",
-		       jiffies, saa7146_read(av7110->dev, PSR),
-		       saa7146_read(av7110->dev, SSR));
+		pr_err("DEBI irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n", jiffies,
+		       saa7146_read(av7110->dev, PSR), saa7146_read(av7110->dev, SSR));
 		goto debi_done;
 	}
 	av7110->debitype = -1;
@@ -424,7 +419,7 @@ static void debiirq(struct tasklet_struct *t)

 	case DATA_DEBUG_MESSAGE:
 		((s8 *)av7110->debi_virt)[Reserved_SIZE - 1] = 0;
-		printk("%s\n", (s8 *) av7110->debi_virt);
+		pr_info("%s\n", (s8 *)av7110->debi_virt);
 		xfer = RX_BUFF;
 		break;

@@ -460,12 +455,11 @@ static void gpioirq(struct tasklet_struct *t)

 	if (av7110->debitype != -1)
 		/* we shouldn't get any irq while a debi xfer is running */
-		printk("dvb-ttpci: GPIO0 irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n",
-		       jiffies, saa7146_read(av7110->dev, PSR),
-		       saa7146_read(av7110->dev, SSR));
+		pr_err("GPIO0 irq oops @ %ld, psr:0x%08x, ssr:0x%08x\n", jiffies,
+		       saa7146_read(av7110->dev, PSR), saa7146_read(av7110->dev, SSR));

 	if (saa7146_wait_for_debi_done(av7110->dev, 0)) {
-		printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __func__);
+		pr_err("%s(): saa7146_wait_for_debi_done timed out\n", __func__);
 		BUG(); /* maybe we should try resetting the debi? */
 	}

@@ -657,7 +651,7 @@ static void gpioirq(struct tasklet_struct *t)
 		break;

 	default:
-		printk("dvb-ttpci: gpioirq unknown type=%d len=%d\n",
+		pr_err("%s(): unknown irq: type=%d len=%d\n", __func__,
 		       av7110->debitype, av7110->debilen);
 		break;
 	}
@@ -798,9 +792,8 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)

 	ret = av7110_fw_request(av7110, buf, 20, &handle, 1);
 	if (ret != 0 || handle >= 32) {
-		printk(KERN_ERR "dvb-ttpci: %s error  buf %04x %04x %04x %04x  ret %d  handle %04x\n",
-				__func__, buf[0], buf[1], buf[2], buf[3],
-				ret, handle);
+		pr_err("%s(): error  buf %04x %04x %04x %04x  ret %d  handle %04x\n",
+		       __func__, buf[0], buf[1], buf[2], buf[3], ret, handle);
 		dvbdmxfilter->hw_handle = 0xffff;
 		if (!ret)
 			ret = -1;
@@ -828,8 +821,8 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)

 	handle = dvbdmxfilter->hw_handle;
 	if (handle >= 32) {
-		printk("%s tried to stop invalid filter %04x, filter type = %x\n",
-				__func__, handle, dvbdmxfilter->type);
+		pr_err("%s(): tried to stop invalid filter %04x, filter type = %x\n",
+		       __func__, handle, dvbdmxfilter->type);
 		return -EINVAL;
 	}

@@ -840,9 +833,8 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
 	buf[2] = handle;
 	ret = av7110_fw_request(av7110, buf, 3, answ, 2);
 	if (ret != 0 || answ[1] != handle) {
-		printk(KERN_ERR "dvb-ttpci: %s error  cmd %04x %04x %04x  ret %x  resp %04x %04x  pid %d\n",
-				__func__, buf[0], buf[1], buf[2], ret,
-				answ[0], answ[1], dvbdmxfilter->feed->pid);
+		pr_err("%s(): error  cmd %04x %04x %04x  ret %x  resp %04x %04x  pid %d\n", __func__,
+		       buf[0], buf[1], buf[2], ret, answ[0], answ[1], dvbdmxfilter->feed->pid);
 		if (!ret)
 			ret = -1;
 	}
@@ -1117,11 +1109,10 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,

 	ret = av7110_fw_request(av7110, &tag, 0, fwstc, 4);
 	if (ret) {
-		printk(KERN_ERR "%s: av7110_fw_request error\n", __func__);
+		pr_err("%s(): av7110_fw_request error\n", __func__);
 		return ret;
 	}
-	dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n",
-		fwstc[0], fwstc[1], fwstc[2], fwstc[3]);
+	dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n", fwstc[0], fwstc[1], fwstc[2], fwstc[3]);

 	*stc =	(((uint64_t)((fwstc[3] & 0x8000) >> 15)) << 32) |
 		(((uint64_t)fwstc[1]) << 16) | ((uint64_t)fwstc[0]);
@@ -1250,11 +1241,10 @@ static void vpeirq(struct tasklet_struct *t)
 	dma_sync_sg_for_cpu(&budget->dev->pci->dev, budget->pt.slist,
 			    budget->pt.nents, DMA_FROM_DEVICE);

-#if 0
+#ifdef RPS_DEBUG
 	/* track rps1 activity */
-	printk("vpeirq: %02x Event Counter 1 0x%04x\n",
-	       mem[olddma],
-	       saa7146_read(budget->dev, EC1R) & 0x3fff);
+	pr_info("%s(): %02x Event Counter 1 0x%04x\n", __func__, mem[olddma],
+		saa7146_read(budget->dev, EC1R) & 0x3fff);
 #endif

 	if (newdma > olddma) {
@@ -1355,7 +1345,7 @@ static int av7110_register(struct av7110 *av7110)
 		dvb_dmxdev_init(&av7110->dmxdev1, &av7110->dvb_adapter);

 		dvb_net_init(&av7110->dvb_adapter, &av7110->dvb_net1, &dvbdemux1->dmx);
-		printk("dvb-ttpci: additional demux1 for budget-patch registered\n");
+		pr_info("additional demux1 for budget-patch registered\n");
 	}
 	return 0;
 }
@@ -1444,7 +1434,7 @@ static int check_firmware(struct av7110 *av7110)
 	ptr = av7110->bin_fw;
 	if (ptr[0] != 'A' || ptr[1] != 'V' ||
 	    ptr[2] != 'F' || ptr[3] != 'W') {
-		printk("dvb-ttpci: this is not an av7110 firmware\n");
+		pr_err("this is not an av7110 firmware\n");
 		return -EINVAL;
 	}
 	ptr += 4;
@@ -1455,11 +1445,11 @@ static int check_firmware(struct av7110 *av7110)
 	len = get_unaligned_be32(ptr);
 	ptr += 4;
 	if (len >= 512) {
-		printk("dvb-ttpci: dpram file is way too big.\n");
+		pr_err("dpram file is way too big.\n");
 		return -EINVAL;
 	}
 	if (crc != crc32_le(0, ptr, len)) {
-		printk("dvb-ttpci: crc32 of dpram file does not match.\n");
+		pr_err("crc32 of dpram file does not match.\n");
 		return -EINVAL;
 	}
 	av7110->bin_dpram = ptr;
@@ -1474,11 +1464,11 @@ static int check_firmware(struct av7110 *av7110)

 	if (len <= 200000 || len >= 300000 ||
 	    len > ((av7110->bin_fw + av7110->size_fw) - ptr)) {
-		printk("dvb-ttpci: root file has strange size (%d). aborting.\n", len);
+		pr_err("root file has strange size (%d). aborting.\n", len);
 		return -EINVAL;
 	}
 	if (crc != crc32_le(0, ptr, len)) {
-		printk("dvb-ttpci: crc32 of root file does not match.\n");
+		pr_err("crc32 of root file does not match.\n");
 		return -EINVAL;
 	}
 	av7110->bin_root = ptr;
@@ -1500,18 +1490,17 @@ static int get_firmware(struct av7110 *av7110)
 	ret = request_firmware(&fw, "dvb-ttpci-01.fw", &av7110->dev->pci->dev);
 	if (ret) {
 		if (ret == -ENOENT) {
-			printk(KERN_ERR "dvb-ttpci: could not load firmware, file not found: dvb-ttpci-01.fw\n");
-			printk(KERN_ERR "dvb-ttpci: usually this should be in /usr/lib/hotplug/firmware or /lib/firmware\n");
-			printk(KERN_ERR "dvb-ttpci: and can be downloaded from https://linuxtv.org/download/dvb/firmware/\n");
+			pr_err("could not load firmware, file not found: dvb-ttpci-01.fw\n");
+			pr_err("usually this should be in /usr/lib/hotplug/firmware or /lib/firmware\n");
+			pr_err("and can be downloaded from https://linuxtv.org/download/dvb/firmware/\n");
 		} else {
-			printk(KERN_ERR "dvb-ttpci: cannot request firmware (error %i)\n",
-			       ret);
+			pr_err("cannot request firmware (error %i)\n", ret);
 		}
 		return -EINVAL;
 	}

 	if (fw->size <= 200000) {
-		printk("dvb-ttpci: this firmware is way too small.\n");
+		pr_err("this firmware is way too small.\n");
 		release_firmware(fw);
 		return -EINVAL;
 	}
@@ -1827,7 +1816,7 @@ static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe)
 	if (fe->ops.i2c_gate_ctrl)
 		fe->ops.i2c_gate_ctrl(fe, 1);
 	if (i2c_transfer(&av7110->i2c_adap, &msg, 1) != 1) {
-		printk("nexusca: pll transfer failed!\n");
+		pr_err("nexusca: pll transfer failed!\n");
 		return -EIO;
 	}

@@ -2234,7 +2223,7 @@ static int frontend_init(struct av7110 *av7110)
 				av7110->fe->tuner_priv = &av7110->i2c_adap;

 				if (!dvb_attach(lnbp21_attach, av7110->fe, &av7110->i2c_adap, 0, 0)) {
-					printk("dvb-ttpci: LNBP21 not found!\n");
+					pr_err("LNBP21 not found!\n");
 					if (av7110->fe->ops.release)
 						av7110->fe->ops.release(av7110->fe);
 					av7110->fe = NULL;
@@ -2250,11 +2239,9 @@ static int frontend_init(struct av7110 *av7110)
 	if (!av7110->fe) {
 		/* FIXME: propagate the failure code from the lower layers */
 		ret = -ENOMEM;
-		printk("dvb-ttpci: A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
-		       av7110->dev->pci->vendor,
-		       av7110->dev->pci->device,
-		       av7110->dev->pci->subsystem_vendor,
-		       av7110->dev->pci->subsystem_device);
+		pr_err("A frontend driver was not found for device [%04x:%04x] subsystem [%04x:%04x]\n",
+		       av7110->dev->pci->vendor, av7110->dev->pci->device,
+		       av7110->dev->pci->subsystem_vendor, av7110->dev->pci->subsystem_device);
 	} else {
 		FE_FUNC_OVERRIDE(av7110->fe->ops.init, av7110->fe_init, av7110_fe_init);
 		FE_FUNC_OVERRIDE(av7110->fe->ops.read_status, av7110->fe_read_status, av7110_fe_read_status);
@@ -2268,7 +2255,7 @@ static int frontend_init(struct av7110 *av7110)

 		ret = dvb_register_frontend(&av7110->dvb_adapter, av7110->fe);
 		if (ret < 0) {
-			printk("av7110: Frontend registration failed!\n");
+			pr_err("av7110: Frontend registration failed!\n");
 			dvb_frontend_detach(av7110->fe);
 			av7110->fe = NULL;
 		}
@@ -2427,12 +2414,12 @@ static int av7110_attach(struct saa7146_dev *dev,
 		 */
 		if ((saa7146_read(dev, GPIO_CTRL) & 0x10000000) == 0) {
 			budgetpatch = 1;
-			printk("dvb-ttpci: BUDGET-PATCH DETECTED.\n");
+			pr_info("BUDGET-PATCH DETECTED.\n");
 		}
 		/* Disable RPS1 */
 		saa7146_write(dev, MC1, (MASK_29));
 #if RPS_IRQ
-		printk("dvb-ttpci: Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff );
+		pr_info("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff);
 #endif
 	}

@@ -2487,7 +2474,7 @@ static int av7110_attach(struct saa7146_dev *dev,
 	}

 	if (av7110->full_ts) {
-		printk(KERN_INFO "dvb-ttpci: full-ts mode enabled for saa7146 port B\n");
+		pr_info("full-ts mode enabled for saa7146 port B\n");
 		spin_lock_init(&av7110->feedlock1);
 		av7110->grabbing = saa7146_vmalloc_build_pgtable(pdev, length,
 								 &av7110->pt);
@@ -2663,9 +2650,8 @@ static int av7110_attach(struct saa7146_dev *dev,
 		goto err_stop_arm_9;

 	if (FW_VERSION(av7110->arm_app) < 0x2501)
-		printk(KERN_WARNING
-		       "dvb-ttpci: Warning, firmware version 0x%04x is too old. System might be unstable!\n",
-		       FW_VERSION(av7110->arm_app));
+		pr_warn("Warning, firmware version 0x%04x is too old. System might be unstable!\n",
+			FW_VERSION(av7110->arm_app));

 	thread = kthread_run(arm_thread, (void *)av7110, "arm_mon");
 	if (IS_ERR(thread)) {
@@ -2702,7 +2688,7 @@ static int av7110_attach(struct saa7146_dev *dev,
 #if IS_ENABLED(CONFIG_DVB_AV7110_IR)
 	av7110_ir_init(av7110);
 #endif
-	printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num);
+	pr_info("found av7110-%d.\n", av7110_num);
 	av7110_num++;
 out:
 	return ret;
diff --git a/drivers/staging/media/av7110/av7110.h b/drivers/staging/media/av7110/av7110.h
index 3f6b88f0f..403dbbba5 100644
--- a/drivers/staging/media/av7110/av7110.h
+++ b/drivers/staging/media/av7110/av7110.h
@@ -40,10 +40,14 @@

 extern int av7110_debug;

+#ifdef pr_fmt
+#undef pr_fmt
+#endif
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #define dprintk(level, fmt, arg...) do {				\
-	if (level & av7110_debug)					\
-		printk(KERN_DEBUG KBUILD_MODNAME ": %s(): " fmt,	\
-		       __func__, ##arg);				\
+	if ((level) & av7110_debug)					\
+		pr_info("%s(): " fmt, __func__, ##arg);			\
 } while (0)

 #define MAXFILT 32
diff --git a/drivers/staging/media/av7110/av7110_av.c b/drivers/staging/media/av7110/av7110_av.c
index a408e10fb..2993ac43c 100644
--- a/drivers/staging/media/av7110/av7110_av.c
+++ b/drivers/staging/media/av7110/av7110_av.c
@@ -151,7 +151,7 @@ int av7110_av_start_play(struct av7110 *av7110, int av)
 {
 	int ret = 0;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if (av7110->rec_mode)
 		return -EBUSY;
@@ -186,7 +186,7 @@ int av7110_av_stop(struct av7110 *av7110, int av)
 {
 	int ret = 0;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if (!(av7110->playing & av) && !(av7110->rec_mode & av))
 		return 0;
@@ -245,14 +245,14 @@ int av7110_pes_play(void *dest, struct dvb_ringbuffer *buf, int dlen)
 		    ((sync & ~0x1f) == 0x000001c0) ||
 		    (sync == 0x000001bd))
 			break;
-		printk("resync\n");
+		pr_info("resync\n");
 		DVB_RINGBUFFER_SKIP(buf, 1);
 	}
 	blen =  DVB_RINGBUFFER_PEEK(buf, 4) << 8;
 	blen |= DVB_RINGBUFFER_PEEK(buf, 5);
 	blen += 6;
 	if (len < blen || blen > dlen) {
-		//printk("buffer empty - avail %d blen %u dlen %d\n", len, blen, dlen);
+		//pr_info("buffer empty - avail %d blen %u dlen %d\n", len, blen, dlen);
 		wake_up(&buf->queue);
 		return -1;
 	}
@@ -271,7 +271,7 @@ int av7110_set_volume(struct av7110 *av7110, unsigned int volleft,
 	unsigned int vol, val, balance = 0;
 	int err;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	av7110->mixer.volume_left = volleft;
 	av7110->mixer.volume_right = volright;
@@ -323,7 +323,7 @@ int av7110_set_vidmode(struct av7110 *av7110, enum av7110_video_mode mode)
 {
 	int ret;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, LoadVidCode, 1, mode);

@@ -357,7 +357,7 @@ static int get_video_format(struct av7110 *av7110, u8 *buf, int count)
 	u8 *p;
 	int ret = 0;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if (av7110->sinfo)
 		return 0;
@@ -410,7 +410,7 @@ static void play_video_cb(u8 *buf, int count, void *priv)
 {
 	struct av7110 *av7110 = (struct av7110 *)priv;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if ((buf[3] & 0xe0) == 0xe0) {
 		get_video_format(av7110, buf, count);
@@ -424,7 +424,7 @@ static void play_audio_cb(u8 *buf, int count, void *priv)
 {
 	struct av7110 *av7110 = (struct av7110 *)priv;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	aux_ring_buffer_write(&av7110->aout, buf, count);
 }
@@ -438,7 +438,7 @@ static ssize_t ts_play(struct av7110 *av7110, const char __user *buf,
 	u8 *kb;
 	unsigned long todo = count;

-	dprintk(2, "%s: type %d cnt %lu\n", __func__, type, count);
+	dprintk(2, "type %d cnt %lu\n", type, count);

 	rb = (type) ? &av7110->avout : &av7110->aout;
 	kb = av7110->kbuf[type];
@@ -474,7 +474,7 @@ static ssize_t dvb_play(struct av7110 *av7110, const char __user *buf,
 {
 	unsigned long todo = count, n;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if (!av7110->kbuf[type])
 		return -ENOBUFS;
@@ -508,7 +508,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf,
 {
 	unsigned long todo = count, n;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if (!av7110->kbuf[type])
 		return -ENOBUFS;
@@ -539,7 +539,7 @@ static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf,
 {
 	unsigned long todo = count, n;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if (!av7110->kbuf[type])
 		return -ENOBUFS;
@@ -841,7 +841,7 @@ int av7110_write_to_decoder(struct dvb_demux_feed *feed, const u8 *buf, size_t l
 	struct dvb_demux *demux = feed->demux;
 	struct av7110 *av7110 = demux->priv;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if (av7110->full_ts && demux->dmx.frontend->source != DMX_MEMORY_FE)
 		return 0;
@@ -928,7 +928,7 @@ static __poll_t dvb_video_poll(struct file *file, poll_table *wait)
 	struct av7110 *av7110 = dvbdev->priv;
 	__poll_t mask = 0;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if ((file->f_flags & O_ACCMODE) != O_RDONLY)
 		poll_wait(file, &av7110->avout.queue, wait);
@@ -958,7 +958,7 @@ static ssize_t dvb_video_write(struct file *file, const char __user *buf,
 	struct av7110 *av7110 = dvbdev->priv;
 	unsigned char c;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if ((file->f_flags & O_ACCMODE) == O_RDONLY)
 		return -EPERM;
@@ -980,7 +980,7 @@ static __poll_t dvb_audio_poll(struct file *file, poll_table *wait)
 	struct av7110 *av7110 = dvbdev->priv;
 	__poll_t mask = 0;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	poll_wait(file, &av7110->aout.queue, wait);

@@ -1002,10 +1002,10 @@ static ssize_t dvb_audio_write(struct file *file, const char __user *buf,
 	struct av7110 *av7110 = dvbdev->priv;
 	unsigned char c;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if (av7110->audiostate.stream_source != AUDIO_SOURCE_MEMORY) {
-		printk(KERN_ERR "not audio source memory\n");
+		pr_err("not audio source memory\n");
 		return -EPERM;
 	}

@@ -1027,7 +1027,7 @@ static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len
 	int progressive = 0;
 	int match = 0;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if (len == 0)
 		return 0;
@@ -1134,7 +1134,7 @@ static int dvb_video_ioctl(struct file *file,
 	unsigned long arg = (unsigned long)parg;
 	int ret = 0;

-	dprintk(1, "av7110:%p, cmd=%04x\n", av7110,cmd);
+	dprintk(1, "av7110:%p, cmd=%04x\n", av7110, cmd);

 	if ((file->f_flags & O_ACCMODE) == O_RDONLY) {
 		if (cmd != VIDEO_GET_STATUS && cmd != VIDEO_GET_EVENT &&
@@ -1366,7 +1366,7 @@ static int dvb_audio_ioctl(struct file *file,
 	unsigned long arg = (unsigned long)parg;
 	int ret = 0;

-	dprintk(1, "av7110:%p, cmd=%04x\n", av7110,cmd);
+	dprintk(1, "av7110:%p, cmd=%04x\n", av7110, cmd);

 	if (((file->f_flags & O_ACCMODE) == O_RDONLY) &&
 	    (cmd != AUDIO_GET_STATUS))
@@ -1514,7 +1514,7 @@ static int dvb_video_open(struct inode *inode, struct file *file)
 	struct av7110 *av7110 = dvbdev->priv;
 	int err;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	err = dvb_generic_open(inode, file);
 	if (err < 0)
@@ -1540,7 +1540,7 @@ static int dvb_video_release(struct inode *inode, struct file *file)
 	struct dvb_device *dvbdev = file->private_data;
 	struct av7110 *av7110 = dvbdev->priv;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if ((file->f_flags & O_ACCMODE) != O_RDONLY)
 		av7110_av_stop(av7110, RP_VIDEO);
@@ -1554,7 +1554,7 @@ static int dvb_audio_open(struct inode *inode, struct file *file)
 	struct av7110 *av7110 = dvbdev->priv;
 	int err = dvb_generic_open(inode, file);

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	if (err < 0)
 		return err;
@@ -1568,7 +1568,7 @@ static int dvb_audio_release(struct inode *inode, struct file *file)
 	struct dvb_device *dvbdev = file->private_data;
 	struct av7110 *av7110 = dvbdev->priv;

-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p\n", av7110);

 	av7110_av_stop(av7110, RP_AUDIO);
 	return dvb_generic_release(inode, file);
diff --git a/drivers/staging/media/av7110/av7110_ca.c b/drivers/staging/media/av7110/av7110_ca.c
index c28e41d42..6ce212c64 100644
--- a/drivers/staging/media/av7110/av7110_ca.c
+++ b/drivers/staging/media/av7110/av7110_ca.c
@@ -26,7 +26,7 @@

 void CI_handle(struct av7110 *av7110, u8 *data, u16 len)
 {
-	dprintk(8, "av7110:%p\n",av7110);
+	dprintk(8, "av7110:%p\n", av7110);

 	if (len < 3)
 		return;
@@ -199,7 +199,7 @@ static int dvb_ca_open(struct inode *inode, struct file *file)
 	struct av7110 *av7110 = dvbdev->priv;
 	int err = dvb_generic_open(inode, file);

-	dprintk(8, "av7110:%p\n",av7110);
+	dprintk(8, "av7110:%p\n", av7110);

 	if (err < 0)
 		return err;
@@ -215,7 +215,7 @@ static __poll_t dvb_ca_poll(struct file *file, poll_table *wait)
 	struct dvb_ringbuffer *wbuf = &av7110->ci_wbuffer;
 	__poll_t mask = 0;

-	dprintk(8, "av7110:%p\n",av7110);
+	dprintk(8, "av7110:%p\n", av7110);

 	poll_wait(file, &rbuf->queue, wait);
 	poll_wait(file, &wbuf->queue, wait);
@@ -236,7 +236,7 @@ static int dvb_ca_ioctl(struct file *file, unsigned int cmd, void *parg)
 	unsigned long arg = (unsigned long)parg;
 	int ret = 0;

-	dprintk(8, "av7110:%p\n",av7110);
+	dprintk(8, "av7110:%p\n", av7110);

 	if (mutex_lock_interruptible(&av7110->ioctl_mutex))
 		return -ERESTARTSYS;
@@ -322,7 +322,7 @@ static ssize_t dvb_ca_write(struct file *file, const char __user *buf,
 	struct dvb_device *dvbdev = file->private_data;
 	struct av7110 *av7110 = dvbdev->priv;

-	dprintk(8, "av7110:%p\n",av7110);
+	dprintk(8, "av7110:%p\n", av7110);
 	return ci_ll_write(&av7110->ci_wbuffer, file, buf, count, ppos);
 }

@@ -332,7 +332,7 @@ static ssize_t dvb_ca_read(struct file *file, char __user *buf,
 	struct dvb_device *dvbdev = file->private_data;
 	struct av7110 *av7110 = dvbdev->priv;

-	dprintk(8, "av7110:%p\n",av7110);
+	dprintk(8, "av7110:%p\n", av7110);
 	return ci_ll_read(&av7110->ci_rbuffer, file, buf, count, ppos);
 }

diff --git a/drivers/staging/media/av7110/av7110_hw.c b/drivers/staging/media/av7110/av7110_hw.c
index 5a4de3e3e..bf8e6dca4 100644
--- a/drivers/staging/media/av7110/av7110_hw.c
+++ b/drivers/staging/media/av7110/av7110_hw.c
@@ -48,11 +48,11 @@ int av7110_debiwrite(struct av7110 *av7110, u32 config,
 	struct saa7146_dev *dev = av7110->dev;

 	if (count > 32764) {
-		printk("%s: invalid count %d\n", __func__, count);
+		pr_err("%s(): invalid count %d\n", __func__, count);
 		return -1;
 	}
 	if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {
-		printk("%s: wait_for_debi_done failed\n", __func__);
+		pr_err("%s(): wait_for_debi_done failed\n", __func__);
 		return -1;
 	}
 	saa7146_write(dev, DEBI_CONFIG, config);
@@ -71,11 +71,11 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, unsigned int co
 	u32 result = 0;

 	if (count > 32764) {
-		printk("%s: invalid count %d\n", __func__, count);
+		pr_err("%s(): invalid count %d\n", __func__, count);
 		return 0;
 	}
 	if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {
-		printk("%s: wait_for_debi_done #1 failed\n", __func__);
+		pr_err("%s(): wait_for_debi_done #1 failed\n", __func__);
 		return 0;
 	}
 	saa7146_write(dev, DEBI_AD, av7110->debi_bus);
@@ -86,7 +86,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, unsigned int co
 	if (count > 4)
 		return count;
 	if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {
-		printk("%s: wait_for_debi_done #2 failed\n", __func__);
+		pr_err("%s(): wait_for_debi_done #2 failed\n", __func__);
 		return 0;
 	}

@@ -146,7 +146,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)

 	for (i = 0; i < blocks; i++) {
 		if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) {
-			printk(KERN_ERR "dvb-ttpci: load_dram(): timeout at block %d\n", i);
+			pr_err("%s(): timeout at block %d\n", __func__, i);
 			return -ETIMEDOUT;
 		}
 		dprintk(4, "writing DRAM block %d\n", i);
@@ -161,7 +161,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)

 	if (rest > 0) {
 		if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) {
-			printk(KERN_ERR "dvb-ttpci: load_dram(): timeout at last block\n");
+			pr_err("%s(): timeout at last block\n", __func__);
 			return -ETIMEDOUT;
 		}
 		if (rest > 4)
@@ -176,13 +176,13 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
 		iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
 	}
 	if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_EMPTY) < 0) {
-		printk(KERN_ERR "dvb-ttpci: load_dram(): timeout after last block\n");
+		pr_err("%s(): timeout after last block\n", __func__);
 		return -ETIMEDOUT;
 	}
 	iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, 0, 2);
 	iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);
 	if (waitdebi(av7110, AV7110_BOOT_STATE, BOOTSTATE_AV7110_BOOT_COMPLETE) < 0) {
-		printk(KERN_ERR "dvb-ttpci: load_dram(): final handshake timeout\n");
+		pr_err("%s(): final handshake timeout\n", __func__);
 		return -ETIMEDOUT;
 	}
 	return 0;
@@ -221,8 +221,8 @@ int av7110_bootarm(struct av7110 *av7110)

 	ret = irdebi(av7110, DEBINOSWAP, DPRAM_BASE, 0, 4);
 	if (ret != 0x10325476) {
-		printk(KERN_ERR "dvb-ttpci: debi test in av7110_bootarm() failed: %08x != %08x (check your BIOS 'Plug&Play OS' settings)\n",
-		       ret, 0x10325476);
+		pr_err("debi test in %s() failed: %08x != %08x (check your BIOS 'Plug&Play OS' settings)\n",
+		       __func__, ret, 0x10325476);
 		return -1;
 	}
 	for (i = 0; i < 8192; i += 4)
@@ -237,8 +237,7 @@ int av7110_bootarm(struct av7110 *av7110)

 	ret = request_firmware(&fw, fw_name, &dev->pci->dev);
 	if (ret) {
-		printk(KERN_ERR "dvb-ttpci: Failed to load firmware \"%s\"\n",
-			fw_name);
+		pr_err("Failed to load firmware \"%s\"\n", fw_name);
 		return ret;
 	}

@@ -247,7 +246,7 @@ int av7110_bootarm(struct av7110 *av7110)
 	iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_STATE, BOOTSTATE_BUFFER_FULL, 2);

 	if (saa7146_wait_for_debi_done(av7110->dev, 1)) {
-		printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): saa7146_wait_for_debi_done() timed out\n");
+		pr_err("%s(): saa7146_wait_for_debi_done() timed out\n", __func__);
 		return -ETIMEDOUT;
 	}
 	saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTHI);
@@ -255,7 +254,7 @@ int av7110_bootarm(struct av7110 *av7110)

 	dprintk(1, "load dram code\n");
 	if (load_dram(av7110, (u32 *)av7110->bin_root, av7110->size_root) < 0) {
-		printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): load_dram() failed\n");
+		pr_err("%s(): load_dram() failed\n", __func__);
 		return -1;
 	}

@@ -266,7 +265,7 @@ int av7110_bootarm(struct av7110 *av7110)
 	mwdebi(av7110, DEBISWAB, DPRAM_BASE, av7110->bin_dpram, av7110->size_dpram);

 	if (saa7146_wait_for_debi_done(av7110->dev, 1)) {
-		printk(KERN_ERR "dvb-ttpci: av7110_bootarm(): saa7146_wait_for_debi_done() timed out after loading DRAM\n");
+		pr_err("%s(): saa7146_wait_for_debi_done() timed out after loading DRAM\n", __func__);
 		return -ETIMEDOUT;
 	}
 	saa7146_setgpio(dev, RESET_LINE, SAA7146_GPIO_OUTHI);
@@ -310,8 +309,7 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags)
 		if ((stat & flags) == 0)
 			break;
 		if (err) {
-			printk(KERN_ERR "%s: timeout waiting for MSGSTATE %04x\n",
-				__func__, stat & flags);
+			pr_err("%s(): timeout waiting for MSGSTATE %04x\n", __func__, stat & flags);
 			return -ETIMEDOUT;
 		}
 		msleep(1);
@@ -341,7 +339,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length)
 		if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0)
 			break;
 		if (err) {
-			printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND idle\n", __func__);
+			pr_err("%s(): timeout waiting for COMMAND idle\n", __func__);
 			av7110->arm_errors++;
 			return -ETIMEDOUT;
 		}
@@ -358,7 +356,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length)
 		if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0)
 			break;
 		if (err) {
-			printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for HANDSHAKE_REG\n", __func__);
+			pr_err("%s(): timeout waiting for HANDSHAKE_REG\n", __func__);
 			return -ETIMEDOUT;
 		}
 		msleep(1);
@@ -397,15 +395,13 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length)
 			err = time_after(jiffies, start + ARM_WAIT_FREE);
 			stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
 			if (stat & flags[0]) {
-				printk(KERN_ERR "%s: %s QUEUE overflow\n",
-					__func__, type);
+				pr_err("%s(): %s QUEUE overflow\n", __func__, type);
 				return -1;
 			}
 			if ((stat & flags[1]) == 0)
 				break;
 			if (err) {
-				printk(KERN_ERR "%s: timeout waiting on busy %s QUEUE\n",
-					__func__, type);
+				pr_err("%s(): timeout waiting on busy %s QUEUE\n", __func__, type);
 				av7110->arm_errors++;
 				return -ETIMEDOUT;
 			}
@@ -433,7 +429,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length)
 		if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0)
 			break;
 		if (err) {
-			printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND %d to complete\n",
+			pr_err("%s(): timeout waiting for COMMAND %d to complete\n",
 			       __func__, (buf[0] >> 8) & 0xff);
 			return -ETIMEDOUT;
 		}
@@ -442,10 +438,10 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length)

 	stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
 	if (stat & GPMQOver) {
-		printk(KERN_ERR "dvb-ttpci: %s(): GPMQOver\n", __func__);
+		pr_err("%s(): GPMQOver\n", __func__);
 		return -ENOSPC;
 	} else if (stat & OSDQOver) {
-		printk(KERN_ERR "dvb-ttpci: %s(): OSDQOver\n", __func__);
+		pr_err("%s(): OSDQOver\n", __func__);
 		return -ENOSPC;
 	}
 #endif
@@ -469,8 +465,7 @@ static int av7110_send_fw_cmd(struct av7110 *av7110, u16 *buf, int length)
 	ret = __av7110_send_fw_cmd(av7110, buf, length);
 	mutex_unlock(&av7110->dcomlock);
 	if (ret && ret != -ERESTARTSYS)
-		printk(KERN_ERR "dvb-ttpci: %s(): av7110_send_fw_cmd error %d\n",
-		       __func__, ret);
+		pr_err("%s(): error %d\n", __func__, ret);
 	return ret;
 }

@@ -483,9 +478,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...)
 //	dprintk(4, "%p\n", av7110);

 	if (2 + num > ARRAY_SIZE(buf)) {
-		printk(KERN_WARNING
-		       "%s: %s len=%d is too big!\n",
-		       KBUILD_MODNAME, __func__, num);
+		pr_warn("%s(): len=%d is too big!\n", __func__, num);
 		return -EINVAL;
 	}

@@ -501,7 +494,7 @@ int av7110_fw_cmd(struct av7110 *av7110, int type, int com, int num, ...)

 	ret = av7110_send_fw_cmd(av7110, buf, num + 2);
 	if (ret && ret != -ERESTARTSYS)
-		printk(KERN_ERR "dvb-ttpci: av7110_fw_cmd error %d\n", ret);
+		pr_err("%s(): error %d\n", __func__, ret);
 	return ret;
 }

@@ -523,7 +516,7 @@ int av7110_send_ci_cmd(struct av7110 *av7110, u8 subcom, u8 *buf, u8 len)

 	ret = av7110_send_fw_cmd(av7110, cmd, 18);
 	if (ret && ret != -ERESTARTSYS)
-		printk(KERN_ERR "dvb-ttpci: av7110_send_ci_cmd error %d\n", ret);
+		pr_err("%s(): error %d\n", __func__, ret);
 	return ret;
 }
 #endif  /*  0  */
@@ -551,7 +544,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
 	err = __av7110_send_fw_cmd(av7110, request_buf, request_buf_len);
 	if (err < 0) {
 		mutex_unlock(&av7110->dcomlock);
-		printk(KERN_ERR "dvb-ttpci: av7110_fw_request error %d\n", err);
+		pr_err("%s(): error %d\n", __func__, err);
 		return err;
 	}

@@ -561,7 +554,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
 		if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0)
 			break;
 		if (err) {
-			printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __func__);
+			pr_err("%s(): timeout waiting for COMMAND to complete\n", __func__);
 			mutex_unlock(&av7110->dcomlock);
 			return -ETIMEDOUT;
 		}
@@ -577,7 +570,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
 		if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0)
 			break;
 		if (err) {
-			printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __func__);
+			pr_err("%s(): timeout waiting for HANDSHAKE_REG\n", __func__);
 			mutex_unlock(&av7110->dcomlock);
 			return -ETIMEDOUT;
 		}
@@ -588,11 +581,11 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
 #ifdef COM_DEBUG
 	stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
 	if (stat & GPMQOver) {
-		printk(KERN_ERR "%s: GPMQOver\n", __func__);
+		pr_err("%s(): GPMQOver\n", __func__);
 		mutex_unlock(&av7110->dcomlock);
 		return -1;
 	} else if (stat & OSDQOver) {
-		printk(KERN_ERR "%s: OSDQOver\n", __func__);
+		pr_err("%s(): OSDQOver\n", __func__);
 		mutex_unlock(&av7110->dcomlock);
 		return -1;
 	}
@@ -611,7 +604,7 @@ static int av7110_fw_query(struct av7110 *av7110, u16 tag, u16 *buf, s16 length)

 	ret = av7110_fw_request(av7110, &tag, 0, buf, length);
 	if (ret)
-		printk(KERN_ERR "dvb-ttpci: av7110_fw_query error %d\n", ret);
+		pr_err("%s(): error %d\n", __func__, ret);
 	return ret;
 }

@@ -628,8 +621,7 @@ int av7110_firmversion(struct av7110 *av7110)
 	dprintk(4, "%p\n", av7110);

 	if (av7110_fw_query(av7110, tag, buf, 16)) {
-		printk("dvb-ttpci: failed to boot firmware @ card %d\n",
-		       av7110->dvb_adapter.num);
+		pr_err("failed to boot firmware @ card %d\n", av7110->dvb_adapter.num);
 		return -EIO;
 	}

@@ -639,17 +631,17 @@ int av7110_firmversion(struct av7110 *av7110)
 	av7110->arm_app = (buf[6] << 16) + buf[7];
 	av7110->avtype = (buf[8] << 16) + buf[9];

-	printk("dvb-ttpci: info @ card %d: firm %08x, rtsl %08x, vid %08x, app %08x\n",
-	       av7110->dvb_adapter.num, av7110->arm_fw,
-	       av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app);
+	pr_info("info @ card %d: firm %08x, rtsl %08x, vid %08x, app %08x\n",
+		av7110->dvb_adapter.num, av7110->arm_fw,
+		av7110->arm_rtsl, av7110->arm_vid, av7110->arm_app);

 	/* print firmware capabilities */
 	if (FW_CI_LL_SUPPORT(av7110->arm_app))
-		printk("dvb-ttpci: firmware @ card %d supports CI link layer interface\n",
-		       av7110->dvb_adapter.num);
+		pr_info("firmware @ card %d supports CI link layer interface\n",
+			av7110->dvb_adapter.num);
 	else
-		printk("dvb-ttpci: no firmware support for CI link layer interface @ card %d\n",
-		       av7110->dvb_adapter.num);
+		pr_info("no firmware support for CI link layer interface @ card %d\n",
+			av7110->dvb_adapter.num);

 	return 0;
 }
@@ -678,7 +670,7 @@ int av7110_diseqc_send(struct av7110 *av7110, int len, u8 *msg, unsigned long bu

 	ret = av7110_send_fw_cmd(av7110, buf, 18);
 	if (ret && ret != -ERESTARTSYS)
-		printk(KERN_ERR "dvb-ttpci: av7110_diseqc_send error %d\n", ret);
+		pr_err("%s(): error %d\n", __func__, ret);
 	return ret;
 }

@@ -723,8 +715,7 @@ static int FlushText(struct av7110 *av7110)
 		if (rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2) == 0)
 			break;
 		if (err) {
-			printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for BUFF1_BASE == 0\n",
-			       __func__);
+			pr_err("%s(): timeout waiting for BUFF1_BASE == 0\n", __func__);
 			mutex_unlock(&av7110->dcomlock);
 			return -ETIMEDOUT;
 		}
@@ -750,8 +741,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf)
 		if (rdebi(av7110, DEBINOSWAP, BUFF1_BASE, 0, 2) == 0)
 			break;
 		if (ret) {
-			printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for BUFF1_BASE == 0\n",
-			       __func__);
+			pr_err("%s(): timeout waiting for BUFF1_BASE == 0\n", __func__);
 			mutex_unlock(&av7110->dcomlock);
 			return -ETIMEDOUT;
 		}
@@ -764,8 +754,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf)
 		if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0)
 			break;
 		if (ret) {
-			printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for HANDSHAKE_REG\n",
-			       __func__);
+			pr_err("%s(): timeout waiting for HANDSHAKE_REG\n", __func__);
 			mutex_unlock(&av7110->dcomlock);
 			return -ETIMEDOUT;
 		}
@@ -780,7 +769,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf)
 	ret = __av7110_send_fw_cmd(av7110, cbuf, 5);
 	mutex_unlock(&av7110->dcomlock);
 	if (ret && ret != -ERESTARTSYS)
-		printk(KERN_ERR "dvb-ttpci: WriteText error %d\n", ret);
+		pr_err("%s(): error %d\n", __func__, ret);
 	return ret;
 }

@@ -839,8 +828,7 @@ static inline int WaitUntilBmpLoaded(struct av7110 *av7110)
 	int ret = wait_event_timeout(av7110->bmpq,
 				av7110->bmp_state != BMP_LOADING, 10 * HZ);
 	if (ret == 0) {
-		printk("dvb-ttpci: warning: timeout waiting in LoadBitmap: %d, %d\n",
-		       ret, av7110->bmp_state);
+		pr_warn("warning: timeout waiting in LoadBitmap: %d, %d\n", ret, av7110->bmp_state);
 		av7110->bmp_state = BMP_NONE;
 		return -ETIMEDOUT;
 	}
@@ -897,7 +885,7 @@ static inline int LoadBitmap(struct av7110 *av7110,
 		}
 	}
 	av7110->bmplen += 1024;
-	dprintk(4, "av7110_fw_cmd: LoadBmp size %d\n", av7110->bmplen);
+	dprintk(4, "av7110_fw_cmd(): LoadBmp size %d\n", av7110->bmplen);
 	ret = av7110_fw_cmd(av7110, COMTYPE_OSD, LoadBmp, 3, format, dx, dy);
 	if (!ret)
 		ret = WaitUntilBmpLoaded(av7110);
@@ -918,7 +906,7 @@ static inline int ReleaseBitmap(struct av7110 *av7110)
 	if (av7110->bmp_state != BMP_LOADED && FW_VERSION(av7110->arm_app) < 0x261e)
 		return -1;
 	if (av7110->bmp_state == BMP_LOADING)
-		dprintk(1,"ReleaseBitmap called while BMP_LOADING\n");
+		dprintk(1, "%s called while BMP_LOADING\n", __func__);
 	av7110->bmp_state = BMP_NONE;
 	return av7110_fw_cmd(av7110, COMTYPE_OSD, ReleaseBmp, 0);
 }
@@ -1033,7 +1021,7 @@ static int OSDSetBlock(struct av7110 *av7110, int x0, int y0,
 	if (!rc)
 		rc = release_rc;
 	if (rc)
-		dprintk(1,"returns %d\n",rc);
+		dprintk(1, "returns %d\n", rc);
 	return rc;
 }

@@ -1180,9 +1168,9 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc)

 	mutex_unlock(&av7110->osd_mutex);
 	if (ret == -ERESTARTSYS)
-		dprintk(1, "av7110_osd_cmd(%d) returns with -ERESTARTSYS\n",dc->cmd);
+		dprintk(1, "%s(%d) returns with -ERESTARTSYS\n", __func__, dc->cmd);
 	else if (ret)
-		dprintk(1, "av7110_osd_cmd(%d) returns with %d\n",dc->cmd,ret);
+		dprintk(1, "%s(%d) returns with %d\n", __func__, dc->cmd, ret);

 	return ret;
 }
diff --git a/drivers/staging/media/av7110/av7110_ir.c b/drivers/staging/media/av7110/av7110_ir.c
index a851ba328..68b3979ba 100644
--- a/drivers/staging/media/av7110/av7110_ir.c
+++ b/drivers/staging/media/av7110/av7110_ir.c
@@ -59,8 +59,7 @@ void av7110_ir_handler(struct av7110 *av7110, u32 ircom)
 			proto = RC_PROTO_RC5;
 			break;
 		default:
-			dprintk(2, "unknown ir config %d\n",
-				av7110->ir.ir_config);
+			dprintk(2, "unknown ir config %d\n", av7110->ir.ir_config);
 			return;
 		}

diff --git a/drivers/staging/media/av7110/av7110_v4l.c b/drivers/staging/media/av7110/av7110_v4l.c
index d13f1afec..04e659243 100644
--- a/drivers/staging/media/av7110/av7110_v4l.c
+++ b/drivers/staging/media/av7110/av7110_v4l.c
@@ -42,8 +42,7 @@ int msp_writereg(struct av7110 *av7110, u8 dev, u16 reg, u16 val)
 	}

 	if (i2c_transfer(&av7110->i2c_adap, &msgs, 1) != 1) {
-		dprintk(1, "dvb-ttpci: failed @ card %d, %u = %u\n",
-		       av7110->dvb_adapter.num, reg, val);
+		dprintk(1, "failed @ card %d, %u = %u\n", av7110->dvb_adapter.num, reg, val);
 		return -EIO;
 	}
 	return 0;
@@ -72,8 +71,7 @@ static int msp_readreg(struct av7110 *av7110, u8 dev, u16 reg, u16 *val)
 	}

 	if (i2c_transfer(&av7110->i2c_adap, &msgs[0], 2) != 2) {
-		dprintk(1, "dvb-ttpci: failed @ card %d, %u\n",
-		       av7110->dvb_adapter.num, reg);
+		dprintk(1, "failed @ card %d, %u\n", av7110->dvb_adapter.num, reg);
 		return -EIO;
 	}
 	*val = (msg2[0] << 8) | msg2[1];
@@ -617,7 +615,7 @@ static ssize_t av7110_vbi_write(struct file *file, const char __user *data, size
 	struct v4l2_sliced_vbi_data d;
 	int rc;

-	dprintk(2, "%s\n", __func__);
+	dprintk(2, "\n");
 	if (FW_VERSION(av7110->arm_app) < 0x2623 || !av7110->wssMode || count != sizeof(d))
 		return -EINVAL;
 	if (copy_from_user(&d, data, count))
@@ -718,7 +716,7 @@ int av7110_init_analog_module(struct av7110 *av7110)
 	msleep(100); // the probing above resets the msp...
 	msp_readreg(av7110, MSP_RD_DSP, 0x001e, &version1);
 	msp_readreg(av7110, MSP_RD_DSP, 0x001f, &version2);
-	dprintk(1, "dvb-ttpci: @ card %d MSP34xx version 0x%04x 0x%04x\n",
+	dprintk(1, "@ card %d MSP34xx version 0x%04x 0x%04x\n",
 		av7110->dvb_adapter.num, version1, version2);
 	msp_writereg(av7110, MSP_WR_DSP, 0x0013, 0x0c00);
 	msp_writereg(av7110, MSP_WR_DSP, 0x0000, 0x7f00); // loudspeaker + headphone
diff --git a/drivers/staging/media/av7110/dvb_filter.c b/drivers/staging/media/av7110/dvb_filter.c
index 71c1d9629..9eafbb82b 100644
--- a/drivers/staging/media/av7110/dvb_filter.c
+++ b/drivers/staging/media/av7110/dvb_filter.c
@@ -39,8 +39,6 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p

 	if (!found)
 		return -1;
-	if (pr)
-		printk(KERN_DEBUG "Audiostream: AC3");

 	ai->off = c;
 	if (c + 5 >= count)
@@ -52,21 +50,18 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p
 	frame = (headr[2] & 0x3f);
 	ai->bit_rate = ac3_bitrates[frame >> 1] * 1000;

-	if (pr)
-		printk(KERN_CONT "  BRate: %d kb/s", (int) ai->bit_rate/1000);
-
 	ai->frequency = (headr[2] & 0xc0) >> 6;
 	fr = (headr[2] & 0xc0) >> 6;
 	ai->frequency = freq[fr] * 100;
-	if (pr)
-		printk(KERN_CONT "  Freq: %d Hz\n", (int) ai->frequency);

 	ai->framesize = ac3_frames[fr][frame >> 1];
 	if ((frame & 1) && (fr == 1))
 		ai->framesize++;
 	ai->framesize = ai->framesize << 1;
+
 	if (pr)
-		printk(KERN_DEBUG "  Framesize %d\n", (int) ai->framesize);
+		pr_info("Audiostream: AC3, BRate: %d kb/s, Freq: %d Hz, Framesize %d\n",
+			(int)ai->bit_rate / 1000, (int)ai->frequency, (int)ai->framesize);

 	return 0;
 }
