1 files changed, 2 insertions, 20 deletions

diff --git a/linux/drivers/media/dvb/ttpci/budget-ci.c b/linux/drivers/media/dvb/ttpci/budget-ci.c
index cade4979e..c2703e558 100644
--- a/linux/drivers/media/dvb/ttpci/budget-ci.c
+++ b/linux/drivers/media/dvb/ttpci/budget-ci.c
@@ -129,7 +129,6 @@ static u8 budget_debiwrite (struct budget_ci* budget_ci, u32 config, int addr, i
 	return 0;
 }
 
-
 /* from reading the following remotes:
    Zenith Universal 7 / TV Mode 807 / VCR Mode 837
    Hauppauge (from NOVA-CI-s box product)
@@ -184,7 +183,6 @@ static	u16 key_map[64] = {
 	0,
 };
 
-
 static void msp430_ir_debounce (unsigned long data)
 {
 	struct input_dev *dev = (struct input_dev *) data;
@@ -200,8 +198,6 @@ static void msp430_ir_debounce (unsigned long data)
 	input_event(dev, EV_KEY, key_map[dev->repeat_key], 2);	/* REPEAT */
 }
 
-
-
 static void msp430_ir_interrupt (unsigned long data)
 {
 	struct budget_ci *budget_ci = (struct budget_ci*) data;
@@ -238,7 +234,6 @@ static void msp430_ir_interrupt (unsigned long data)
 	}
 }
 
-
 static int msp430_ir_init (struct budget_ci *budget_ci)
 {
 	struct saa7146_dev *saa = budget_ci->budget.dev;
@@ -266,7 +261,6 @@ static int msp430_ir_init (struct budget_ci *budget_ci)
 	return 0;
 }
 
-
 static void msp430_ir_deinit (struct budget_ci *budget_ci)
 {
 	struct saa7146_dev *saa = budget_ci->budget.dev;
@@ -349,7 +343,6 @@ static int ciintf_slot_ts_enable(struct dvb_ca_en50221* ca, int slot) {
 
 	if (slot != 0) return -EINVAL;
 
-
 	saa7146_setgpio(saa, 1, SAA7146_GPIO_OUTLO);
 
 	tmp = budget_debiread(budget_ci, DEBICICTL, DEBIADDR_CICONTROL, 1);
@@ -359,7 +352,6 @@ static int ciintf_slot_ts_enable(struct dvb_ca_en50221* ca, int slot) {
 	return 0;
 }
 
-
 static void ciintf_interrupt (unsigned long data)
 {
 	struct budget_ci *budget_ci = (struct budget_ci*) data;
@@ -428,7 +420,6 @@ static int ciintf_init(struct budget_ci* budget_ci)
 	budget_ci->slot_status = SLOTSTATUS_NONE;
 	if (flags & CICONTROL_CAMDETECT) budget_ci->slot_status = SLOTSTATUS_PRESENT;
 
-
 	// register CI interface
 	budget_ci->ca.read_attribute_mem = ciintf_read_attribute_mem;
 	budget_ci->ca.write_attribute_mem = ciintf_write_attribute_mem;
@@ -500,7 +491,7 @@ static void budget_ci_irq (struct saa7146_dev *dev, u32 *isr)
 {
 	struct budget_ci *budget_ci = (struct budget_ci*) dev->ext_priv;
 
-	DEB_EE(("dev: %p, budget_ci: %p\n", dev, budget_ci));
+	dprintk(8, "dev: %p, budget_ci: %p\n", dev, budget_ci);
 
 	if (*isr & MASK_06)
 		tasklet_schedule (&budget_ci->msp430_irq_tasklet);
@@ -512,8 +503,6 @@ static void budget_ci_irq (struct saa7146_dev *dev, u32 *isr)
 		tasklet_schedule (&budget_ci->ciintf_irq_tasklet);
 }
 
-
-
 static int budget_ci_attach (struct saa7146_dev* dev,
 		      struct saa7146_pci_extension_data *info)
 {
@@ -523,7 +512,7 @@ static int budget_ci_attach (struct saa7146_dev* dev,
 	if (!(budget_ci = kmalloc (sizeof(struct budget_ci), GFP_KERNEL)))
 		return -ENOMEM;
 
-	DEB_EE(("budget_ci: %p\n", budget_ci));
+	dprintk(2, "budget_ci: %p\n", budget_ci);
 
 	spin_lock_init(&budget_ci->debilock);
 	budget_ci->budget.ci_present = 0;
@@ -545,8 +534,6 @@ static int budget_ci_attach (struct saa7146_dev* dev,
 	return 0;
 }
 
-
-
 static int budget_ci_detach (struct saa7146_dev* dev)
 {
 	struct budget_ci *budget_ci = (struct budget_ci*) dev->ext_priv;
@@ -569,8 +556,6 @@ static int budget_ci_detach (struct saa7146_dev* dev)
 	return err;
 }
 
-
-
 static struct saa7146_extension budget_extension;
 
 MAKE_BUDGET_INFO(ttbci,	"TT-Budget/WinTV-NOVA-CI PCI",	BUDGET_TT_HW_DISEQC);
@@ -600,16 +585,13 @@ static struct saa7146_extension budget_extension = {
 	.irq_func	= budget_ci_irq,
 };
 
-
 static int __init budget_ci_init(void)
 {
 	return saa7146_register_extension(&budget_extension);
 }
 
-
 static void __exit budget_ci_exit(void)
 {
-	DEB_EE((".\n"));
 	saa7146_unregister_extension(&budget_extension);
 }