Commit 1f15ddd0 authored by David Johnson's avatar David Johnson Committed by Linus Torvalds
Browse files

[PATCH] dvb: bt8xx: cleanup 



Indentation fixes and remove unnecessary braces.

Signed-off-by: default avatarDavid Johnson <dj@david-web.co.uk>
Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 466d725a

drivers/media/dvb/bt8xx/dvb-bt8xx.c

+114 −111
Original line number Diff line number Diff line
@@ -32,9 +32,7 @@ 
#include "dvbdev.h"

#include "dvb_demux.h"

#include "dvb_frontend.h"



#include "dvb-bt8xx.h"



#include "bt878.h"



static int debug;
@@ -43,9 +41,9 @@ module_param(debug, int, 0644); 
MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");



#define dprintk( args... ) \

	do { \

	do \

		if (debug) printk(KERN_DEBUG args); \

	} while (0)

	while (0)



static void dvb_bt8xx_task(unsigned long data)

{
@@ -119,14 +117,12 @@ static struct bt878 __init *dvb_bt8xx_878_match(unsigned int bttv_nr, struct pci 
	unsigned int card_nr;



	/* Hmm, n squared. Hope n is small */

	for (card_nr = 0; card_nr < bt878_num; card_nr++) {

	for (card_nr = 0; card_nr < bt878_num; card_nr++)

		if (is_pci_slot_eq(bt878[card_nr].dev, bttv_pci_dev))

			return &bt878[card_nr];

	}

	return NULL;

}





static int thomson_dtt7579_demod_init(struct dvb_frontend* fe)

{

	static u8 mt352_clock_config [] = { 0x89, 0x38, 0x38 };
@@ -157,13 +153,19 @@ static int thomson_dtt7579_pll_set(struct dvb_frontend* fe, struct dvb_frontend_ 
	#define IF_FREQUENCYx6 217    /* 6 * 36.16666666667MHz */

	div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;



	if (params->frequency < 542000000) cp = 0xb4;

	else if (params->frequency < 771000000) cp = 0xbc;

	else cp = 0xf4;

	if (params->frequency < 542000000)

		cp = 0xb4;

	else if (params->frequency < 771000000)

		cp = 0xbc;

	else

		cp = 0xf4;



	if (params->frequency == 0) bs = 0x03;

	else if (params->frequency < 443250000) bs = 0x02;

	else bs = 0x08;

	if (params->frequency == 0)

		bs = 0x03;

	else if (params->frequency < 443250000)

		bs = 0x02;

	else

		bs = 0x08;



	pllbuf[0] = 0xc0; // Note: non-linux standard PLL i2c address

	pllbuf[1] = div >> 8;
@@ -175,7 +177,6 @@ static int thomson_dtt7579_pll_set(struct dvb_frontend* fe, struct dvb_frontend_ 
}



static struct mt352_config thomson_dtt7579_config = {



	.demod_address = 0x0f,

	.demod_init = thomson_dtt7579_demod_init,

	.pll_set = thomson_dtt7579_pll_set,
@@ -188,7 +189,6 @@ static int cx24108_pll_set(struct dvb_frontend* fe, struct dvb_frontend_paramete 
	int i, a, n, pump;

	u32 band, pll;





	u32 osci[]={950000,1019000,1075000,1178000,1296000,1432000,

		1576000,1718000,1856000,2036000,2150000};

	u32 bandsel[]={0,0x00020000,0x00040000,0x00100800,0x00101000,
@@ -200,8 +200,10 @@ static int cx24108_pll_set(struct dvb_frontend* fe, struct dvb_frontend_paramete 


	/* This is really the bit driving the tuner chip cx24108 */



	if(freq<950000) freq=950000; /* kHz */

	if(freq>2150000) freq=2150000; /* satellite IF is 950..2150MHz */

	if (freq<950000)

		freq = 950000; /* kHz */

	else if (freq>2150000)

		freq = 2150000; /* satellite IF is 950..2150MHz */



	/* decide which VCO to use for the input frequency */

	for(i=1;(i<sizeof(osci)/sizeof(osci[0]))&&(osci[i]<freq);i++);
@@ -228,7 +230,7 @@ static int cx24108_pll_set(struct dvb_frontend* fe, struct dvb_frontend_paramete 
	cx24110_pll_write(fe,0x500c0000);

	cx24110_pll_write(fe,0x83f1f800);

	cx24110_pll_write(fe,pll);

/*        writereg(client,0x56,0x7f);*/

	//writereg(client,0x56,0x7f);



	return 0;

}
@@ -238,15 +240,12 @@ static int pinnsat_pll_init(struct dvb_frontend* fe) 
	return 0;

}





static struct cx24110_config pctvsat_config = {



	.demod_address = 0x55,

	.pll_init = pinnsat_pll_init,

	.pll_set = cx24108_pll_set,

};





static int microtune_mt7202dtf_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)

{

	struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv;
@@ -258,15 +257,23 @@ static int microtune_mt7202dtf_pll_set(struct dvb_frontend* fe, struct dvb_front 
	div = (36000000 + params->frequency + 83333) / 166666;

	cfg = 0x88;



	if (params->frequency < 175000000) cpump = 2;

	else if (params->frequency < 390000000) cpump = 1;

	else if (params->frequency < 470000000) cpump = 2;

	else if (params->frequency < 750000000) cpump = 2;

	else cpump = 3;

	if (params->frequency < 175000000)

		cpump = 2;

	else if (params->frequency < 390000000)

		cpump = 1;

	else if (params->frequency < 470000000)

		cpump = 2;

	else if (params->frequency < 750000000)

		cpump = 2;

	else

		cpump = 3;



	if (params->frequency < 175000000) band_select = 0x0e;

	else if (params->frequency < 470000000) band_select = 0x05;

	else band_select = 0x03;

	if (params->frequency < 175000000)

		band_select = 0x0e;

	else if (params->frequency < 470000000)

		band_select = 0x05;

	else

		band_select = 0x03;



	data[0] = (div >> 8) & 0x7f;

	data[1] = div & 0xff;
@@ -285,14 +292,11 @@ static int microtune_mt7202dtf_request_firmware(struct dvb_frontend* fe, const s 
}



static struct sp887x_config microtune_mt7202dtf_config = {



	.demod_address = 0x70,

	.pll_set = microtune_mt7202dtf_pll_set,

	.request_firmware = microtune_mt7202dtf_request_firmware,

};







static int advbt771_samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe)

{

	static u8 mt352_clock_config [] = { 0x89, 0x38, 0x2d };
@@ -303,7 +307,6 @@ static int advbt771_samsung_tdtc9251dh0_demod_init(struct dvb_frontend* fe) 
	static u8 mt352_av771_extra[] = { 0xB5, 0x7A };

	static u8 mt352_capt_range_cfg[] = { 0x75, 0x32 };





	mt352_write(fe, mt352_clock_config, sizeof(mt352_clock_config));

	udelay(2000);

	mt352_write(fe, mt352_reset, sizeof(mt352_reset));
@@ -326,25 +329,43 @@ static int advbt771_samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct 
	#define IF_FREQUENCYx6 217    /* 6 * 36.16666666667MHz */

	div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;



	if (params->frequency < 150000000) cp = 0xB4;

	else if (params->frequency < 173000000) cp = 0xBC;

	else if (params->frequency < 250000000) cp = 0xB4;

	else if (params->frequency < 400000000) cp = 0xBC;

	else if (params->frequency < 420000000) cp = 0xF4;

	else if (params->frequency < 470000000) cp = 0xFC;

	else if (params->frequency < 600000000) cp = 0xBC;

	else if (params->frequency < 730000000) cp = 0xF4;

	else cp = 0xFC;



	if (params->frequency < 150000000) bs = 0x01;

	else if (params->frequency < 173000000) bs = 0x01;

	else if (params->frequency < 250000000) bs = 0x02;

	else if (params->frequency < 400000000) bs = 0x02;

	else if (params->frequency < 420000000) bs = 0x02;

	else if (params->frequency < 470000000) bs = 0x02;

	else if (params->frequency < 600000000) bs = 0x08;

	else if (params->frequency < 730000000) bs = 0x08;

	else bs = 0x08;

	if (params->frequency < 150000000)

		cp = 0xB4;

	else if (params->frequency < 173000000)

		cp = 0xBC;

	else if (params->frequency < 250000000)

		cp = 0xB4;

	else if (params->frequency < 400000000)

		cp = 0xBC;

	else if (params->frequency < 420000000)

		cp = 0xF4;

	else if (params->frequency < 470000000)

		cp = 0xFC;

	else if (params->frequency < 600000000)

		cp = 0xBC;

	else if (params->frequency < 730000000)

		cp = 0xF4;

	else

		cp = 0xFC;



	if (params->frequency < 150000000)

		bs = 0x01;

	else if (params->frequency < 173000000)

		bs = 0x01;

	else if (params->frequency < 250000000)

		bs = 0x02;

	else if (params->frequency < 400000000)

		bs = 0x02;

	else if (params->frequency < 420000000)

		bs = 0x02;

	else if (params->frequency < 470000000)

		bs = 0x02;

	else if (params->frequency < 600000000)

		bs = 0x08;

	else if (params->frequency < 730000000)

		bs = 0x08;

	else

		bs = 0x08;



	pllbuf[0] = 0xc2; // Note: non-linux standard PLL i2c address

	pllbuf[1] = div >> 8;
@@ -356,19 +377,15 @@ static int advbt771_samsung_tdtc9251dh0_pll_set(struct dvb_frontend* fe, struct 
}



static struct mt352_config advbt771_samsung_tdtc9251dh0_config = {



	.demod_address = 0x0f,

	.demod_init = advbt771_samsung_tdtc9251dh0_demod_init,

	.pll_set = advbt771_samsung_tdtc9251dh0_pll_set,

};





static struct dst_config dst_config = {



	.demod_address = 0x55,

};





static int or51211_request_firmware(struct dvb_frontend* fe, const struct firmware **fw, char* name)

{

	struct dvb_bt8xx_card* bt = (struct dvb_bt8xx_card*) fe->dvb->priv;
@@ -398,10 +415,9 @@ static void or51211_reset(struct dvb_frontend * fe) 
	 */

	/* reset & PRM1,2&4 are outputs */

	int ret = bttv_gpio_enable(bt->bttv_nr, 0x001F, 0x001F);

	if (ret != 0) {

	if (ret != 0)

		printk(KERN_WARNING "or51211: Init Error - Can't Reset DVR "

		       "(%i)\n", ret);

	}

	bttv_write_gpio(bt->bttv_nr, 0x001F, 0x0000);   /* Reset */

	msleep(20);

	/* Now set for normal operation */
@@ -417,7 +433,6 @@ static void or51211_sleep(struct dvb_frontend * fe) 
}



static struct or51211_config or51211_config = {



	.demod_address = 0x15,

	.request_firmware = or51211_request_firmware,

	.setmode = or51211_setmode,
@@ -425,7 +440,6 @@ static struct or51211_config or51211_config = { 
	.sleep = or51211_sleep,

};





static int vp3021_alps_tded4_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)

{

	struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv;
@@ -454,13 +468,11 @@ static int vp3021_alps_tded4_pll_set(struct dvb_frontend* fe, struct dvb_fronten 
}



static struct nxt6000_config vp3021_alps_tded4_config = {



	.demod_address = 0x0a,

	.clock_inversion = 1,

	.pll_set = vp3021_alps_tded4_pll_set,

};





static void frontend_init(struct dvb_bt8xx_card *card, u32 type)

{

	int ret;
@@ -484,16 +496,14 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) 
		case BTTV_NEBULA_DIGITV:

#endif

		card->fe = nxt6000_attach(&vp3021_alps_tded4_config, card->i2c_adapter);

		if (card->fe != NULL) {

		if (card->fe != NULL)

			break;

		}

		break;



		case BTTV_AVDVBT_761:

		card->fe = sp887x_attach(&microtune_mt7202dtf_config, card->i2c_adapter);

		if (card->fe != NULL) {

		if (card->fe != NULL)

			break;

		}

		break;



		case BTTV_AVDVBT_771:
@@ -522,36 +532,33 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) 


		/*	Attach other DST peripherals if any		*/

		/*	Conditional Access device			*/

		if (state->dst_hw_cap & DST_TYPE_HAS_CA) {

		if (state->dst_hw_cap & DST_TYPE_HAS_CA)

			ret = dst_ca_attach(state, &card->dvb_adapter);

		}

		if (card->fe != NULL) {



		if (card->fe != NULL)

			break;

		}

		break;



		case BTTV_PINNACLESAT:

		card->fe = cx24110_attach(&pctvsat_config, card->i2c_adapter);

		if (card->fe != NULL) {

		if (card->fe != NULL)

			break;

		}

		break;



		case BTTV_PC_HDTV:

		card->fe = or51211_attach(&or51211_config, card->i2c_adapter);

		if (card->fe != NULL) {

		if (card->fe != NULL)

			break;

		}

		break;

	}



	if (card->fe == NULL) {

	if (card->fe == NULL)

		printk("dvb-bt8xx: A frontend driver was not found for device %04x/%04x subsystem %04x/%04x\n",

		       card->bt->dev->vendor,

		       card->bt->dev->device,

		       card->bt->dev->subsystem_vendor,

		       card->bt->dev->subsystem_device);

	} else {

	else

		if (dvb_register_frontend(&card->dvb_adapter, card->fe)) {

			printk("dvb-bt8xx: Frontend registration failed!\n");

			if (card->fe->ops->release)
@@ -559,17 +566,14 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) 
			card->fe = NULL;

		}

}

}



static int __init dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type)

{

	int result;



	if ((result = dvb_register_adapter(&card->dvb_adapter, card->card_name,

					   THIS_MODULE)) < 0) {

	if ((result = dvb_register_adapter(&card->dvb_adapter, card->card_name, THIS_MODULE)) < 0) {

		printk("dvb_bt8xx: dvb_register_adapter failed (errno = %d)\n", result);

		return result;



	}

	card->dvb_adapter.priv = card;
@@ -664,8 +668,7 @@ static int dvb_bt8xx_probe(struct device *dev) 
	strncpy(card->card_name, sub->core->name, sizeof(sub->core->name));

	card->i2c_adapter = &sub->core->i2c_adap;



	switch(sub->core->type)

	{

	switch(sub->core->type) {

		case BTTV_PINNACLESAT:

		card->gpio_mode = 0x0400c060;

		/* should be: BT878_A_GAIN=0,BT878_A_PWRDN,BT878_DA_DPM,BT878_DA_SBR,
@@ -751,7 +754,6 @@ static int dvb_bt8xx_probe(struct device *dev) 


		kfree(card);

		return -EFAULT;



	}



	init_MUTEX(&card->bt->gpio_lock);
@@ -779,7 +781,8 @@ static int dvb_bt8xx_remove(struct device *dev) 
	card->demux.dmx.remove_frontend(&card->demux.dmx, &card->fe_hw);

	dvb_dmxdev_release(&card->dmxdev);

	dvb_dmx_release(&card->demux);

	if (card->fe) dvb_unregister_frontend(card->fe);

	if (card->fe)

		dvb_unregister_frontend(card->fe);

	dvb_unregister_adapter(&card->dvb_adapter);



	kfree(card);