V4L/DVB (13809): Fix Checkpatch violations

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

15 files changed, 78 insertions, 74 deletions

diff --git a/drivers/media/dvb/mantis/hopper_cards.c b/drivers/media/dvb/mantis/hopper_cards.c
index 6d5d101f0ab0..ca70149f3ddf 100644
--- a/drivers/media/dvb/mantis/hopper_cards.c
+++ b/drivers/media/dvb/mantis/hopper_cards.c
@@ -137,7 +137,7 @@ static int __devinit hopper_pci_probe(struct pci_dev *pdev, const struct pci_dev
 	struct mantis_hwconfig *config;
 	int err = 0;
 
-	mantis = kzalloc(sizeof (struct mantis_pci), GFP_KERNEL);
+	mantis = kzalloc(sizeof(struct mantis_pci), GFP_KERNEL);
 	if (mantis == NULL) {
 		printk(KERN_ERR "%s ERROR: Out of memory\n", __func__);
 		err = -ENOMEM;
diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c
index 88899ac96d63..2f3ba81eaa07 100644
--- a/drivers/media/dvb/mantis/mantis_ca.c
+++ b/drivers/media/dvb/mantis/mantis_ca.c
@@ -119,7 +119,7 @@ static int mantis_ts_control(struct dvb_ca_en50221 *en50221, int slot)
 	struct mantis_pci *mantis = ca->ca_priv;
 
 	dprintk(MANTIS_DEBUG, 1, "Slot(%d): TS control", slot);
-//	mantis_set_direction(mantis, 1); /* Enable TS through CAM */
+/*	mantis_set_direction(mantis, 1); */ /* Enable TS through CAM */
 
 	return 0;
 }
@@ -148,7 +148,7 @@ int mantis_ca_init(struct mantis_pci *mantis)
 	int ca_flags = 0, result;
 
 	dprintk(MANTIS_DEBUG, 1, "Initializing Mantis CA");
-	ca = kzalloc(sizeof (struct mantis_ca), GFP_KERNEL);
+	ca = kzalloc(sizeof(struct mantis_ca), GFP_KERNEL);
 	if (!ca) {
 		dprintk(MANTIS_ERROR, 1, "Out of memory!, exiting ..");
 		result = -ENOMEM;
diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/dvb/mantis/mantis_cards.c
index f3fefbbc876f..a4250fad6ac1 100644
--- a/drivers/media/dvb/mantis/mantis_cards.c
+++ b/drivers/media/dvb/mantis/mantis_cards.c
@@ -145,7 +145,7 @@ static int __devinit mantis_pci_probe(struct pci_dev *pdev, const struct pci_dev
 	struct mantis_hwconfig *config;
 	int err = 0;
 
-	mantis = kzalloc(sizeof (struct mantis_pci), GFP_KERNEL);
+	mantis = kzalloc(sizeof(struct mantis_pci), GFP_KERNEL);
 	if (mantis == NULL) {
 		printk(KERN_ERR "%s ERROR: Out of memory\n", __func__);
 		err = -ENOMEM;
diff --git a/drivers/media/dvb/mantis/mantis_core.c b/drivers/media/dvb/mantis/mantis_core.c
index 52b3e9ebfcfa..3ddc9ba8440f 100644
--- a/drivers/media/dvb/mantis/mantis_core.c
+++ b/drivers/media/dvb/mantis/mantis_core.c
@@ -36,14 +36,16 @@ static int read_eeprom_byte(struct mantis_pci *mantis, u8 *data, u8 length)
 			.flags = 0,
 			.buf = data,
 			.len = 1
-		},{
+		}, {
 			.addr = 0x50,
 			.flags = I2C_M_RD,
 			.buf = data,
 			.len = length
 		},
 	};
-	if ((err = i2c_transfer(&mantis->adapter, msg, 2)) < 0) {
+
+	err = i2c_transfer(&mantis->adapter, msg, 2);
+	if (err < 0) {
 		dprintk(verbose, MANTIS_ERROR, 1,
 			"ERROR: i2c read: < err=%i d0=0x%02x d1=0x%02x >",
 			err, data[0], data[1]);
@@ -65,7 +67,8 @@ static int write_eeprom_byte(struct mantis_pci *mantis, u8 *data, u8 length)
 		.len = length
 	};
 
-	if ((err = i2c_transfer(&mantis->adapter, &msg, 1)) < 0) {
+	err = i2c_transfer(&mantis->adapter, &msg, 1);
+	if (err < 0) {
 		dprintk(verbose, MANTIS_ERROR, 1,
 			"ERROR: i2c write: < err=%i length=0x%02x d0=0x%02x, d1=0x%02x >",
 			err, length, data[0], data[1]);
@@ -81,7 +84,8 @@ static int get_mac_address(struct mantis_pci *mantis)
 	int err;
 
 	mantis->mac_address[0] = 0x08;
-	if ((err = read_eeprom_byte(mantis, &mantis->mac_address[0], 6)) < 0) {
+	err = read_eeprom_byte(mantis, &mantis->mac_address[0], 6);
+	if (err < 0) {
 		dprintk(verbose, MANTIS_ERROR, 1, "Mantis EEPROM read error");
 
 		return err;
@@ -106,25 +110,25 @@ struct mantis_hwconfig unknown_device = {
 static void mantis_load_config(struct mantis_pci *mantis)
 {
 	switch (mantis->subsystem_device) {
-	case MANTIS_VP_1033_DVB_S:	// VP-1033
+	case MANTIS_VP_1033_DVB_S:	/* VP-1033 */
 		mantis->hwconfig = &vp1033_mantis_config;
 		break;
-	case MANTIS_VP_1034_DVB_S:	// VP-1034
+	case MANTIS_VP_1034_DVB_S:	/* VP-1034 */
 		mantis->hwconfig = &vp1034_mantis_config;
 		break;
-	case MANTIS_VP_1041_DVB_S2:	// VP-1041
+	case MANTIS_VP_1041_DVB_S2:	/* VP-1041 */
 	case TECHNISAT_SKYSTAR_HD2:
 		mantis->hwconfig = &vp1041_mantis_config;
 		break;
-	case MANTIS_VP_2033_DVB_C:	// VP-2033
+	case MANTIS_VP_2033_DVB_C:	/* VP-2033 */
 		mantis->hwconfig = &vp2033_mantis_config;
 		break;
-	case MANTIS_VP_2040_DVB_C:	// VP-2040
-	case TERRATEC_CINERGY_C_PCI:	// VP-2040 clone
+	case MANTIS_VP_2040_DVB_C:	/* VP-2040 */
+	case TERRATEC_CINERGY_C_PCI:	/* VP-2040 clone */
 	case TECHNISAT_CABLESTAR_HD2:
 		mantis->hwconfig = &vp2040_mantis_config;
 		break;
-	case MANTIS_VP_3030_DVB_T:	// VP-3030
+	case MANTIS_VP_3030_DVB_T:	/* VP-3030 */
 		mantis->hwconfig = &vp3030_mantis_config;
 		break;
 	default:
@@ -149,23 +153,28 @@ int mantis_core_init(struct mantis_pci *mantis)
 		mantis->pdev->irq, mantis->latency,
 		mantis->mantis_addr, mantis->mantis_mmio);
 
-	if ((err = mantis_i2c_init(mantis)) < 0) {
+	err = mantis_i2c_init(mantis);
+	if (err < 0) {
 		dprintk(verbose, MANTIS_ERROR, 1, "Mantis I2C init failed");
 		return err;
 	}
-	if ((err = get_mac_address(mantis)) < 0) {
+	err = get_mac_address(mantis);
+	if (err < 0) {
 		dprintk(verbose, MANTIS_ERROR, 1, "get MAC address failed");
 		return err;
 	}
-	if ((err = mantis_dma_init(mantis)) < 0) {
+	err = mantis_dma_init(mantis);
+	if (err < 0) {
 		dprintk(verbose, MANTIS_ERROR, 1, "Mantis DMA init failed");
 		return err;
 	}
-	if ((err = mantis_dvb_init(mantis)) < 0) {
+	err = mantis_dvb_init(mantis);
+	if (err < 0) {
 		dprintk(verbose, MANTIS_DEBUG, 1, "Mantis DVB init failed");
 		return err;
 	}
-	if ((err = mantis_uart_init(mantis)) < 0) {
+	err = mantis_uart_init(mantis);
+	if (err < 0) {
 		dprintk(verbose, MANTIS_DEBUG, 1, "Mantis UART init failed");
 		return err;
 	}
@@ -191,7 +200,7 @@ int mantis_core_exit(struct mantis_pci *mantis)
 	return 0;
 }
 
-// Turn the given bit on or off.
+/* Turn the given bit on or off. */
 void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value)
 {
 	u32 cur;
@@ -207,14 +216,15 @@ void gpio_set_bits(struct mantis_pci *mantis, u32 bitpos, u8 value)
 	udelay(100);
 }
 
-//direction = 0 , no CI passthrough ; 1 , CI passthrough
+/* direction = 0 , no CI passthrough ; 1 , CI passthrough */
 void mantis_set_direction(struct mantis_pci *mantis, int direction)
 {
 	u32 reg;
 
 	reg = mmread(0x28);
 	dprintk(verbose, MANTIS_DEBUG, 1, "TS direction setup");
-	if (direction == 0x01) { //to CI
+	if (direction == 0x01) {
+		/* to CI */
 		reg |= 0x04;
 		mmwrite(reg, 0x28);
 		reg &= 0xff - 0x04;
diff --git a/drivers/media/dvb/mantis/mantis_core.h b/drivers/media/dvb/mantis/mantis_core.h
index a80939409935..8511b0cebac1 100644
--- a/drivers/media/dvb/mantis/mantis_core.h
+++ b/drivers/media/dvb/mantis/mantis_core.h
@@ -33,15 +33,15 @@
 
 
 struct vendorname {
-	__u8  *sub_vendor_name;
-	__u32 sub_vendor_id;
+	u8  *sub_vendor_name;
+	u32 sub_vendor_id;
 };
 
 struct devicetype {
-	__u8  *sub_device_name;
-	__u32 sub_device_id;
-	__u8  device_type;
-	__u32 type_flags;
+	u8  *sub_device_name;
+	u32 sub_device_id;
+	u8  device_type;
+	u32 type_flags;
 };
 
 
@@ -54,4 +54,4 @@ extern int mantis_i2c_exit(struct mantis_pci *mantis);
 extern int mantis_core_init(struct mantis_pci *mantis);
 extern int mantis_core_exit(struct mantis_pci *mantis);
 
-#endif //__MANTIS_CORE_H
+#endif /* __MANTIS_CORE_H */
diff --git a/drivers/media/dvb/mantis/mantis_dma.c b/drivers/media/dvb/mantis/mantis_dma.c
index eab3645f7acb..adad1f37efde 100644
--- a/drivers/media/dvb/mantis/mantis_dma.c
+++ b/drivers/media/dvb/mantis/mantis_dma.c
@@ -43,10 +43,10 @@
 #define RISC_IRQ		(0x01 << 24)
 
 #define RISC_STATUS(status)	((((~status) & 0x0f) << 20) | ((status & 0x0f) << 16))
-#define RISC_FLUSH()		mantis->risc_pos = 0
-#define RISC_INSTR(opcode)	mantis->risc_cpu[mantis->risc_pos++] = cpu_to_le32(opcode)
+#define RISC_FLUSH()		(mantis->risc_pos = 0)
+#define RISC_INSTR(opcode)	(mantis->risc_cpu[mantis->risc_pos++] = cpu_to_le32(opcode))
 
-#define MANTIS_BUF_SIZE		64 * 1024
+#define MANTIS_BUF_SIZE		(64 * 1024)
 #define MANTIS_BLOCK_BYTES	(MANTIS_BUF_SIZE >> 4)
 #define MANTIS_BLOCK_COUNT	(1 << 4)
 #define MANTIS_RISC_SIZE	PAGE_SIZE
@@ -158,7 +158,8 @@ int mantis_dma_init(struct mantis_pci *mantis)
 
 		goto err;
 	}
-	if ((err = mantis_calc_lines(mantis)) < 0) {
+	err = mantis_calc_lines(mantis);
+	if (err < 0) {
 		dprintk(MANTIS_ERROR, 1, "Mantis calc lines failed");
 
 		goto err;
@@ -248,7 +249,7 @@ void mantis_dma_xfer(unsigned long data)
 		dprintk(MANTIS_DEBUG, 1, "last block=[%d] finished block=[%d]",
 			mantis->last_block, mantis->finished_block);
 
-		(config->ts_size ? dvb_dmx_swfilter_204: dvb_dmx_swfilter)
+		(config->ts_size ? dvb_dmx_swfilter_204 : dvb_dmx_swfilter)
 		(&mantis->demux, &mantis->buf_cpu[mantis->last_block * MANTIS_BLOCK_BYTES], MANTIS_BLOCK_BYTES);
 		mantis->last_block = (mantis->last_block + 1) % MANTIS_BLOCK_COUNT;
 	}
diff --git a/drivers/media/dvb/mantis/mantis_dvb.c b/drivers/media/dvb/mantis/mantis_dvb.c
index 54bf4ea9efd7..8982d6fdf6be 100644
--- a/drivers/media/dvb/mantis/mantis_dvb.c
+++ b/drivers/media/dvb/mantis/mantis_dvb.c
@@ -116,7 +116,6 @@ static int mantis_dvb_start_feed(struct dvb_demux_feed *dvbdmxfeed)
 
 	if (mantis->feeds == 1)	 {
 		dprintk(MANTIS_DEBUG, 1, "mantis start feed & dma");
-		printk("mantis start feed & dma\n");
 		mantis_dma_start(mantis);
 	}
 
@@ -137,7 +136,6 @@ static int mantis_dvb_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
 	mantis->feeds--;
 	if (mantis->feeds == 0) {
 		dprintk(MANTIS_DEBUG, 1, "mantis stop feed and dma");
-		printk("mantis stop feed and dma\n");
 		mantis_dma_stop(mantis);
 	}
 
@@ -204,9 +202,9 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis)
 	}
 
 	mantis->fe_mem.source		= DMX_MEMORY_FE;
-	result = mantis->demux.dmx.add_frontend(&mantis->demux.dmx,&mantis->fe_mem);
+	result = mantis->demux.dmx.add_frontend(&mantis->demux.dmx, &mantis->fe_mem);
 	if (result < 0) {
-		dprintk(MANTIS_ERROR, 1,"dvb_dmx_init failed, ERROR=%d", result);
+		dprintk(MANTIS_ERROR, 1, "dvb_dmx_init failed, ERROR=%d", result);
 		goto err3;
 	}
 
@@ -224,10 +222,6 @@ int __devinit mantis_dvb_init(struct mantis_pci *mantis)
 			dprintk(MANTIS_ERROR, 1, "!!! NO Frontends found !!!");
 			goto err5;
 		} else {
-//			if (mantis->dvb_adapter == NULL) {
-//				dprintk(MANTIS_ERROR, 1, "DVB adapter <NULL>");
-//				goto err5;
-//			}
 			if (mantis->fe == NULL) {
 				dprintk(MANTIS_ERROR, 1, "FE <NULL>");
 				goto err5;
@@ -277,7 +271,7 @@ int __devexit mantis_dvb_exit(struct mantis_pci *mantis)
 	int err;
 
 	if (mantis->fe) {
-//		mantis_ca_exit(mantis);
+		/* mantis_ca_exit(mantis); */
 		err = mantis_frontend_shutdown(mantis);
 		if (err != 0)
 			dprintk(MANTIS_ERROR, 1, "Frontend exit while POWER ON! <%d>", err);
diff --git a/drivers/media/dvb/mantis/mantis_i2c.c b/drivers/media/dvb/mantis/mantis_i2c.c
index 7bb4e78aa714..dd38b9333537 100644
--- a/drivers/media/dvb/mantis/mantis_i2c.c
+++ b/drivers/media/dvb/mantis/mantis_i2c.c
@@ -225,7 +225,7 @@ int __devinit mantis_i2c_init(struct mantis_pci *mantis)
 
 	init_waitqueue_head(&mantis->i2c_wq);
 	mutex_init(&mantis->i2c_lock);
-	strncpy(i2c_adapter->name, "Mantis I2C", sizeof (i2c_adapter->name));
+	strncpy(i2c_adapter->name, "Mantis I2C", sizeof(i2c_adapter->name));
 	i2c_set_adapdata(i2c_adapter, mantis);
 
 	i2c_adapter->owner	= THIS_MODULE;
diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c
index b27d7759788b..487d149c802d 100644
--- a/drivers/media/dvb/mantis/mantis_input.c
+++ b/drivers/media/dvb/mantis/mantis_input.c
@@ -36,9 +36,9 @@ static struct ir_scancode mantis_ir_table[] = {
 	{ 0x29, KEY_POWER	},
 	{ 0x28, KEY_FAVORITES	},
 	{ 0x30, KEY_TEXT	},
-	{ 0x17, KEY_INFO	}, // Preview
+	{ 0x17, KEY_INFO	}, /* Preview */
 	{ 0x23, KEY_EPG		},
-	{ 0x3b, KEY_F22		},// Record List
+	{ 0x3b, KEY_F22		}, /* Record List */
 	{ 0x3c, KEY_1		},
 	{ 0x3e, KEY_2		},
 	{ 0x39, KEY_3		},
@@ -71,22 +71,22 @@ static struct ir_scancode mantis_ir_table[] = {
 
 	{ 0x1f, KEY_REWIND	},
 	{ 0x2d, KEY_FASTFORWARD	},
-	{ 0x1e, KEY_PREVIOUS	}, // Replay |<
-	{ 0x1d, KEY_NEXT	}, // Skip   >|
+	{ 0x1e, KEY_PREVIOUS	}, /* Replay |< */
+	{ 0x1d, KEY_NEXT	}, /* Skip   >| */
 
-	{ 0x0b, KEY_CAMERA	}, // Capture
-	{ 0x0f, KEY_LANGUAGE	}, // SAP
-	{ 0x18, KEY_MODE	}, // PIP
-	{ 0x12, KEY_ZOOM	}, // Full screen,
+	{ 0x0b, KEY_CAMERA	}, /* Capture */
+	{ 0x0f, KEY_LANGUAGE	}, /* SAP */
+	{ 0x18, KEY_MODE	}, /* PIP */
+	{ 0x12, KEY_ZOOM	}, /* Full screen */
 	{ 0x1c, KEY_SUBTITLE	},
 	{ 0x2f, KEY_MUTE	},
-	{ 0x16, KEY_F20		}, // L/R,
-	{ 0x38, KEY_F21		}, // Hibernate,
+	{ 0x16, KEY_F20		}, /* L/R */
+	{ 0x38, KEY_F21		}, /* Hibernate */
 
-	{ 0x37, KEY_SWITCHVIDEOMODE }, // A/V
-	{ 0x31, KEY_AGAIN	}, // Recall,
-	{ 0x1a, KEY_KPPLUS	}, // Zoom+,
-	{ 0x19, KEY_KPMINUS	}, // Zoom-,
+	{ 0x37, KEY_SWITCHVIDEOMODE }, /* A/V */
+	{ 0x31, KEY_AGAIN	}, /* Recall */
+	{ 0x1a, KEY_KPPLUS	}, /* Zoom+ */
+	{ 0x19, KEY_KPMINUS	}, /* Zoom- */
 	{ 0x27, KEY_RED		},
 	{ 0x0C, KEY_GREEN	},
 	{ 0x01, KEY_YELLOW	},
diff --git a/drivers/media/dvb/mantis/mantis_reg.h b/drivers/media/dvb/mantis/mantis_reg.h
index 0072e149a561..c2f572b49faf 100644
--- a/drivers/media/dvb/mantis/mantis_reg.h
+++ b/drivers/media/dvb/mantis/mantis_reg.h
@@ -29,7 +29,7 @@
 #define MANTIS_INT_RISCEN		(0x01 << 27)
 #define MANTIS_INT_I2CRACK		(0x01 << 26)
 
-//#define MANTIS_INT_GPIF			(0xff << 12)
+/* #define MANTIS_INT_GPIF			(0xff << 12) */
 
 #define MANTIS_INT_PCMCIA7		(0x01 << 19)
 #define MANTIS_INT_PCMCIA6		(0x01 << 18)
diff --git a/drivers/media/dvb/mantis/mantis_vp1033.c b/drivers/media/dvb/mantis/mantis_vp1033.c
index c9760b00d0ab..3c62be30bbb6 100644
--- a/drivers/media/dvb/mantis/mantis_vp1033.c
+++ b/drivers/media/dvb/mantis/mantis_vp1033.c
@@ -93,7 +93,7 @@ int lgtdqcs001f_tuner_set(struct dvb_frontend *fe,
 	u32 div;
 
 
-	struct i2c_msg msg = {.addr = 0x61, .flags = 0, .buf = buf, .len = sizeof (buf) };
+	struct i2c_msg msg = {.addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf)};
 
 	div = params->frequency / 250;
 
@@ -140,12 +140,12 @@ int lgtdqcs001f_set_symbol_rate(struct dvb_frontend *fe,
 		aclk = 0xb4;
 		bclk = 0x51;
 	}
-	stv0299_writereg (fe, 0x13, aclk);
-	stv0299_writereg (fe, 0x14, bclk);
+	stv0299_writereg(fe, 0x13, aclk);
+	stv0299_writereg(fe, 0x14, bclk);
 
-	stv0299_writereg (fe, 0x1f, (ratio >> 16) & 0xff);
-	stv0299_writereg (fe, 0x20, (ratio >>  8) & 0xff);
-	stv0299_writereg (fe, 0x21, (ratio      ) & 0xf0);
+	stv0299_writereg(fe, 0x1f, (ratio >> 16) & 0xff);
+	stv0299_writereg(fe, 0x20, (ratio >>  8) & 0xff);
+	stv0299_writereg(fe, 0x21,  ratio & 0xf0);
 
 	return 0;
 }
diff --git a/drivers/media/dvb/mantis/mantis_vp1034.c b/drivers/media/dvb/mantis/mantis_vp1034.c
index 7ddd149b0fea..36486b53f677 100644
--- a/drivers/media/dvb/mantis/mantis_vp1034.c
+++ b/drivers/media/dvb/mantis/mantis_vp1034.c
@@ -62,7 +62,7 @@ int vp1034_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
 		dprintk(MANTIS_ERROR, 1, "Frontend (dummy) POWERDOWN");
 		break;
 	default:
-		dprintk(MANTIS_ERROR, 1, "Invalid = (%d)", (u32 ) voltage);
+		dprintk(MANTIS_ERROR, 1, "Invalid = (%d)", (u32) voltage);
 		return -EINVAL;
 	}
 	mmwrite(0x00, MANTIS_GPIF_DOUT);
diff --git a/drivers/media/dvb/mantis/mantis_vp1041.c b/drivers/media/dvb/mantis/mantis_vp1041.c
index 368fc815a61d..515346dd31d0 100644
--- a/drivers/media/dvb/mantis/mantis_vp1041.c
+++ b/drivers/media/dvb/mantis/mantis_vp1041.c
@@ -44,7 +44,7 @@
 
 static const struct stb0899_s1_reg vp1041_stb0899_s1_init_1[] = {
 
-//	 0x0000000b ,	/* SYSREG */
+	/* 0x0000000b, *//* SYSREG */
 	{ STB0899_DEV_ID		, 0x30 },
 	{ STB0899_DISCNTRL1		, 0x32 },
 	{ STB0899_DISCNTRL2     	, 0x80 },
@@ -55,7 +55,7 @@ static const struct stb0899_s1_reg vp1041_stb0899_s1_init_1[] = {
 	{ STB0899_DISSTATUS		, 0x20 },
 	{ STB0899_DISF22        	, 0x99 },
 	{ STB0899_DISF22RX      	, 0xa8 },
-	//SYSREG ?
+	/* SYSREG ? */
 	{ STB0899_ACRPRESC      	, 0x11 },
 	{ STB0899_ACRDIV1       	, 0x0a },
 	{ STB0899_ACRDIV2       	, 0x05 },
@@ -323,9 +323,8 @@ static int vp1041_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *
 				vp1041_stb0899_config.demod_address);
 
 			if (stb6100_attach(mantis->fe, &vp1041_stb6100_config, adapter)) {
-				if (!lnbp21_attach(mantis->fe, adapter, 0, 0)) {
-					printk("%s: No LNBP21 found!\n", __func__);
-				}
+				if (!lnbp21_attach(mantis->fe, adapter, 0, 0))
+					dprintk(MANTIS_ERROR, 1, "No LNBP21 found!");
 			}
 		} else {
 			return -EREMOTEIO;
diff --git a/drivers/media/dvb/mantis/mantis_vp2033.c b/drivers/media/dvb/mantis/mantis_vp2033.c
index 45f71749bb98..07d468ff5e13 100644
--- a/drivers/media/dvb/mantis/mantis_vp2033.c
+++ b/drivers/media/dvb/mantis/mantis_vp2033.c
@@ -71,7 +71,7 @@ static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_fronten
 	struct i2c_adapter *adapter = &mantis->adapter;
 
 	u8 buf[6];
-	struct i2c_msg msg = {.addr = 0x60, .flags = 0, .buf = buf, .len = sizeof (buf) };
+	struct i2c_msg msg = {.addr = 0x60, .flags = 0, .buf = buf, .len = sizeof(buf)};
 	int i;
 
 #define CU1216_IF 36125000
diff --git a/drivers/media/dvb/mantis/mantis_vp2040.c b/drivers/media/dvb/mantis/mantis_vp2040.c
index 8471bff672f3..a7ca233e800b 100644
--- a/drivers/media/dvb/mantis/mantis_vp2040.c
+++ b/drivers/media/dvb/mantis/mantis_vp2040.c
@@ -53,7 +53,7 @@ static int tda1002x_cu1216_tuner_set(struct dvb_frontend *fe, struct dvb_fronten
 	struct i2c_adapter *adapter	= &mantis->adapter;
 
 	u8 buf[6];
-	struct i2c_msg msg = {.addr = 0x60,.flags = 0,.buf = buf,.len = sizeof (buf) };
+	struct i2c_msg msg = {.addr = 0x60, .flags = 0, .buf = buf, .len = sizeof(buf)};
 	int i;
 
 #define CU1216_IF 36125000