V4L/DVB (4439): Whitespace cleanups for cx88-dvb and saa7134-dvb

This patch cleans up some whitespace problems after the dvb_attach changes
in cx88-dvb.c and saa7134-dvb.c, and converts some capitalized i2c address
constants to lowercase.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 107 insertions, 86 deletions

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 52467b2ecdcb4e..ebbf540771328a 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -165,7 +165,7 @@ static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe)
 }
 
 static struct mt352_config dvico_fusionhdtv = {
-	.demod_address = 0x0F,
+	.demod_address = 0x0f,
 	.demod_init    = dvico_fusionhdtv_demod_init,
 };
 
@@ -175,7 +175,7 @@ static struct mt352_config dntv_live_dvbt_config = {
 };
 
 static struct mt352_config dvico_fusionhdtv_dual = {
-	.demod_address = 0x0F,
+	.demod_address = 0x0f,
 	.demod_init    = dvico_dual_demod_init,
 };
 
@@ -250,8 +250,8 @@ static int dntv_live_dvbt_pro_tuner_set_params(struct dvb_frontend* fe,
 	if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
 
 		printk(KERN_WARNING "cx88-dvb: %s error "
-			   "(addr %02x <- %02x, err = %i)\n",
-			   __FUNCTION__, dev->core->pll_addr, buf[0], err);
+		       "(addr %02x <- %02x, err = %i)\n",
+		       __FUNCTION__, dev->core->pll_addr, buf[0], err);
 		if (err < 0)
 			return err;
 		else
@@ -286,8 +286,8 @@ static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe,
 		fe->ops.i2c_gate_ctrl(fe, 1);
 	if ((err = i2c_transfer(&dev->core->i2c_adap, &msg, 1)) != 1) {
 		printk(KERN_WARNING "cx88-dvb: %s error "
-			   "(addr %02x <- %02x, err = %i)\n",
-			   __FUNCTION__, pllbuf[0], pllbuf[1], err);
+		       "(addr %02x <- %02x, err = %i)\n",
+		       __FUNCTION__, pllbuf[0], pllbuf[1], err);
 		if (err < 0)
 			return err;
 		else
@@ -298,12 +298,12 @@ static int dvico_hybrid_tuner_set_params(struct dvb_frontend *fe,
 }
 
 static struct zl10353_config dvico_fusionhdtv_hybrid = {
-	.demod_address = 0x0F,
+	.demod_address = 0x0f,
 	.no_tuner      = 1,
 };
 
 static struct zl10353_config dvico_fusionhdtv_plus_v1_1 = {
-	.demod_address = 0x0F,
+	.demod_address = 0x0f,
 };
 
 static struct cx22702_config connexant_refboard_config = {
@@ -329,8 +329,8 @@ static int or51132_set_ts_param(struct dvb_frontend* fe,
 }
 
 static struct or51132_config pchdtv_hd3000 = {
-	.demod_address    = 0x15,
-	.set_ts_params    = or51132_set_ts_param,
+	.demod_address = 0x15,
+	.set_ts_params = or51132_set_ts_param,
 };
 
 static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
@@ -349,14 +349,14 @@ static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
 
 	dvb_pll_configure(core->pll_desc, buf, params->frequency, 0);
 	dprintk(1, "%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
-			__FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
+		__FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
 
 	if (fe->ops.i2c_gate_ctrl)
 		fe->ops.i2c_gate_ctrl(fe, 1);
 	if ((err = i2c_transfer(&core->i2c_adap, &msg, 1)) != 1) {
 		printk(KERN_WARNING "cx88-dvb: %s error "
-			   "(addr %02x <- %02x, err = %i)\n",
-			   __FUNCTION__, buf[0], buf[1], err);
+		       "(addr %02x <- %02x, err = %i)\n",
+		       __FUNCTION__, buf[0], buf[1], err);
 		if (err < 0)
 			return err;
 		else
@@ -401,24 +401,24 @@ static int lgdt330x_set_ts_param(struct dvb_frontend* fe, int is_punctured)
 }
 
 static struct lgdt330x_config fusionhdtv_3_gold = {
-	.demod_address    = 0x0e,
-	.demod_chip       = LGDT3302,
-	.serial_mpeg      = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */
-	.set_ts_params    = lgdt330x_set_ts_param,
+	.demod_address = 0x0e,
+	.demod_chip    = LGDT3302,
+	.serial_mpeg   = 0x04, /* TPSERIAL for 3302 in TOP_CONTROL */
+	.set_ts_params = lgdt330x_set_ts_param,
 };
 
 static struct lgdt330x_config fusionhdtv_5_gold = {
-	.demod_address    = 0x0e,
-	.demod_chip       = LGDT3303,
-	.serial_mpeg      = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
-	.set_ts_params    = lgdt330x_set_ts_param,
+	.demod_address = 0x0e,
+	.demod_chip    = LGDT3303,
+	.serial_mpeg   = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
+	.set_ts_params = lgdt330x_set_ts_param,
 };
 
 static struct lgdt330x_config pchdtv_hd5500 = {
-	.demod_address    = 0x59,
-	.demod_chip       = LGDT3303,
-	.serial_mpeg      = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
-	.set_ts_params    = lgdt330x_set_ts_param,
+	.demod_address = 0x59,
+	.demod_chip    = LGDT3303,
+	.serial_mpeg   = 0x40, /* TPSERIAL for 3303 in TOP_CONTROL */
+	.set_ts_params = lgdt330x_set_ts_param,
 };
 
 static int nxt200x_set_ts_param(struct dvb_frontend* fe,
@@ -439,26 +439,27 @@ static int nxt200x_set_pll_input(u8* buf, int input)
 }
 
 static struct nxt200x_config ati_hdtvwonder = {
-	.demod_address    = 0x0a,
-	.set_pll_input    = nxt200x_set_pll_input,
-	.set_ts_params    = nxt200x_set_ts_param,
+	.demod_address = 0x0a,
+	.set_pll_input = nxt200x_set_pll_input,
+	.set_ts_params = nxt200x_set_ts_param,
 };
 
 static int cx24123_set_ts_param(struct dvb_frontend* fe,
 	int is_punctured)
 {
 	struct cx8802_dev *dev= fe->dvb->priv;
-	dev->ts_gen_cntrl = 0x2;
+	dev->ts_gen_cntrl = 0x02;
 	return 0;
 }
 
-static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
+static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe,
+				       fe_sec_voltage_t voltage)
 {
 	struct cx8802_dev *dev= fe->dvb->priv;
 	struct cx88_core *core = dev->core;
 
 	if (voltage == SEC_VOLTAGE_OFF) {
-		cx_write(MO_GP0_IO, 0x000006fB);
+		cx_write(MO_GP0_IO, 0x000006fb);
 	} else {
 		cx_write(MO_GP0_IO, 0x000006f9);
 	}
@@ -468,7 +469,8 @@ static int kworld_dvbs_100_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t
 	return 0;
 }
 
-static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe,
+				      fe_sec_voltage_t voltage)
 {
 	struct cx8802_dev *dev= fe->dvb->priv;
 	struct cx88_core *core = dev->core;
@@ -484,18 +486,18 @@ static int geniatech_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t
 }
 
 static struct cx24123_config geniatech_dvbs_config = {
-	.demod_address  = 0x55,
-	.set_ts_params  = cx24123_set_ts_param,
+	.demod_address = 0x55,
+	.set_ts_params = cx24123_set_ts_param,
 };
 
 static struct cx24123_config hauppauge_novas_config = {
-	.demod_address		= 0x55,
-	.set_ts_params		= cx24123_set_ts_param,
+	.demod_address = 0x55,
+	.set_ts_params = cx24123_set_ts_param,
 };
 
 static struct cx24123_config kworld_dvbs_100_config = {
-	.demod_address		= 0x15,
-	.set_ts_params		= cx24123_set_ts_param,
+	.demod_address = 0x15,
+	.set_ts_params = cx24123_set_ts_param,
 };
 
 static int dvb_register(struct cx8802_dev *dev)
@@ -507,48 +509,53 @@ static int dvb_register(struct cx8802_dev *dev)
 	/* init frontend */
 	switch (dev->core->board) {
 	case CX88_BOARD_HAUPPAUGE_DVB_T1:
-		dev->dvb.frontend = dvb_attach(cx22702_attach, &hauppauge_novat_config,
-						   &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(cx22702_attach,
+					       &hauppauge_novat_config,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-				       &dev->core->i2c_adap,
-				       &dvb_pll_thomson_dtt759x);
+				   &dev->core->i2c_adap,
+				   &dvb_pll_thomson_dtt759x);
 		}
 		break;
 	case CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1:
 	case CX88_BOARD_CONEXANT_DVB_T1:
 	case CX88_BOARD_KWORLD_DVB_T_CX22702:
 	case CX88_BOARD_WINFAST_DTV1000:
-		dev->dvb.frontend = dvb_attach(cx22702_attach, &connexant_refboard_config,
-						   &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(cx22702_attach,
+					       &connexant_refboard_config,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
-				       &dev->core->i2c_adap,
-				       &dvb_pll_thomson_dtt7579);
+				   &dev->core->i2c_adap,
+				   &dvb_pll_thomson_dtt7579);
 		}
 		break;
 	case CX88_BOARD_WINFAST_DTV2000H:
 	case CX88_BOARD_HAUPPAUGE_HVR1100:
 	case CX88_BOARD_HAUPPAUGE_HVR1100LP:
-		dev->dvb.frontend = dvb_attach(cx22702_attach, &hauppauge_hvr1100_config,
-						   &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(cx22702_attach,
+					       &hauppauge_hvr1100_config,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-				       &dev->core->i2c_adap,
-				       &dvb_pll_fmd1216me);
+				   &dev->core->i2c_adap,
+				   &dvb_pll_fmd1216me);
 		}
 		break;
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
-		dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv,
-						 &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(mt352_attach,
+					       &dvico_fusionhdtv,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
 				   NULL, &dvb_pll_thomson_dtt7579);
 			break;
 		}
 		/* ZL10353 replaces MT352 on later cards */
-		dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_plus_v1_1,
-						   &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(zl10353_attach,
+					       &dvico_fusionhdtv_plus_v1_1,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
 				   NULL, &dvb_pll_thomson_dtt7579);
@@ -557,24 +564,27 @@ static int dvb_register(struct cx8802_dev *dev)
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL:
 		/* The tin box says DEE1601, but it seems to be DTT7579
 		 * compatible, with a slightly different MT352 AGC gain. */
-		dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv_dual,
-						 &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(mt352_attach,
+					       &dvico_fusionhdtv_dual,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
 				   NULL, &dvb_pll_thomson_dtt7579);
 			break;
 		}
 		/* ZL10353 replaces MT352 on later cards */
-		dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_plus_v1_1,
-						   &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(zl10353_attach,
+					       &dvico_fusionhdtv_plus_v1_1,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
 				   NULL, &dvb_pll_thomson_dtt7579);
 		}
 		break;
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
-		dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv,
-						 &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(mt352_attach,
+					       &dvico_fusionhdtv,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
 				   NULL, &dvb_pll_lg_z201);
@@ -583,8 +593,9 @@ static int dvb_register(struct cx8802_dev *dev)
 	case CX88_BOARD_KWORLD_DVB_T:
 	case CX88_BOARD_DNTV_LIVE_DVB_T:
 	case CX88_BOARD_ADSTECH_DVB_T_PCI:
-		dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_config,
-						 &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(mt352_attach,
+					       &dntv_live_dvbt_config,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
 				   NULL, &dvb_pll_unknown_1);
@@ -606,19 +617,21 @@ static int dvb_register(struct cx8802_dev *dev)
 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
 		dev->core->pll_addr = 0x61;
 		dev->core->pll_desc = &dvb_pll_thomson_fe6600;
-		dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_hybrid,
-						   &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(zl10353_attach,
+					       &dvico_fusionhdtv_hybrid,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dev->dvb.frontend->ops.tuner_ops.set_params = dvico_hybrid_tuner_set_params;
 		}
 		break;
 	case CX88_BOARD_PCHDTV_HD3000:
-		dev->dvb.frontend = dvb_attach(or51132_attach, &pchdtv_hd3000,
-						 &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(or51132_attach,
+					       &pchdtv_hd3000,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-				       &dev->core->i2c_adap,
-				       &dvb_pll_thomson_dtt761x);
+				   &dev->core->i2c_adap,
+				   &dvb_pll_thomson_dtt761x);
 		}
 		break;
 	case CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q:
@@ -636,8 +649,9 @@ static int dvb_register(struct cx8802_dev *dev)
 		fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set;
 		dev->core->pll_addr = 0x61;
 		dev->core->pll_desc = &dvb_pll_microtune_4042;
-		dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_3_gold,
-						    &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(lgdt330x_attach,
+					       &fusionhdtv_3_gold,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params;
 		}
@@ -655,8 +669,9 @@ static int dvb_register(struct cx8802_dev *dev)
 		mdelay(200);
 		dev->core->pll_addr = 0x61;
 		dev->core->pll_desc = &dvb_pll_thomson_dtt761x;
-		dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_3_gold,
-						    &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(lgdt330x_attach,
+					       &fusionhdtv_3_gold,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params;
 		}
@@ -672,8 +687,9 @@ static int dvb_register(struct cx8802_dev *dev)
 		mdelay(100);
 		cx_set(MO_GP0_IO, 1);
 		mdelay(200);
-		dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_5_gold,
-						    &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(lgdt330x_attach,
+					       &fusionhdtv_5_gold,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
 		}
@@ -689,16 +705,18 @@ static int dvb_register(struct cx8802_dev *dev)
 		mdelay(100);
 		cx_set(MO_GP0_IO, 1);
 		mdelay(200);
-		dev->dvb.frontend = dvb_attach(lgdt330x_attach, &pchdtv_hd5500,
-						    &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(lgdt330x_attach,
+					       &pchdtv_hd5500,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
 		}
 		}
 		break;
 	case CX88_BOARD_ATI_HDTVWONDER:
-		dev->dvb.frontend = dvb_attach(nxt200x_attach, &ati_hdtvwonder,
-						 &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(nxt200x_attach,
+					       &ati_hdtvwonder,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend != NULL) {
 			dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
 				   NULL, &dvb_pll_tuv1236d);
@@ -706,24 +724,27 @@ static int dvb_register(struct cx8802_dev *dev)
 		break;
 	case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
 	case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
-		dev->dvb.frontend = dvb_attach(cx24123_attach, &hauppauge_novas_config,
-			&dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(cx24123_attach,
+					       &hauppauge_novas_config,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend) {
-			dvb_attach(isl6421_attach, dev->dvb.frontend, &dev->core->i2c_adap,
-				       0x08, 0x00, 0x00);
+			dvb_attach(isl6421_attach, dev->dvb.frontend,
+				   &dev->core->i2c_adap, 0x08, 0x00, 0x00);
 		}
 		break;
 	case CX88_BOARD_KWORLD_DVBS_100:
-		dev->dvb.frontend = dvb_attach(cx24123_attach, &kworld_dvbs_100_config,
-			&dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(cx24123_attach,
+					       &kworld_dvbs_100_config,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend) {
 			dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
 			dev->dvb.frontend->ops.set_voltage = kworld_dvbs_100_set_voltage;
 		}
 		break;
 	case CX88_BOARD_GENIATECH_DVBS:
-		dev->dvb.frontend = dvb_attach(cx24123_attach, &geniatech_dvbs_config,
-						   &dev->core->i2c_adap);
+		dev->dvb.frontend = dvb_attach(cx24123_attach,
+					       &geniatech_dvbs_config,
+					       &dev->core->i2c_adap);
 		if (dev->dvb.frontend) {
 			dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
 			dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage;