Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 955e6ed8 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] CodingStyle cleanup at s5h1432 and cx231xx 



The patches received from the vendor contained a lot of CodingStyle
issues. Cleans the style issues reported by checkpatch.pl on
those drivers.

It is better to do such style fixes when merging a big set of
changes than latter. Of course, the better is to receive patches
already cleaned ;)

Acked-by: default avatarSri Deevi <Srinivasa.Deevi@conexant.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 61b04cb2

drivers/media/dvb/frontends/s5h1432.c

+19 −26
Original line number Diff line number Diff line 
/*

    Samsung s5h1432 DVB-T demodulator driver



    Copyright (C) 2009 Bill Liu <Bill.Liu@Conexant.com>



    This program is free software; you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by

    the Free Software Foundation; either version 2 of the License, or

    (at your option) any later version.



    This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of

    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

    GNU General Public License for more details.



    You should have received a copy of the GNU General Public License

    along with this program; if not, write to the Free Software

    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.



 *  Samsung s5h1432 DVB-T demodulator driver

 *

 *  Copyright (C) 2009 Bill Liu <Bill.Liu@Conexant.com>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#include <linux/kernel.h>
@@ -379,7 +378,6 @@ struct dvb_frontend *s5h1432_attach(const struct s5h1432_config *config, 
	kfree(state);

	return NULL;

}



EXPORT_SYMBOL(s5h1432_attach);



static struct dvb_frontend_ops s5h1432_ops = {
@@ -415,8 +413,3 @@ MODULE_PARM_DESC(debug, "Enable verbose debug messages"); 
MODULE_DESCRIPTION("Samsung s5h1432 DVB-T Demodulator driver");

MODULE_AUTHOR("Bill Liu");

MODULE_LICENSE("GPL");
 


/*

 * Local variables:

 * c-basic-offset: 8

 */

drivers/media/dvb/frontends/s5h1432.h

+19 −24
Original line number Diff line number Diff line 
/*

    Samsung s5h1432 VSB/QAM demodulator driver



    Copyright (C) 2009 Bill Liu <Bill.Liu@Conexant.com>



    This program is free software; you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by

    the Free Software Foundation; either version 2 of the License, or

    (at your option) any later version.



    This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of

    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

    GNU General Public License for more details.



    You should have received a copy of the GNU General Public License

    along with this program; if not, write to the Free Software

    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.



 *  Samsung s5h1432 VSB/QAM demodulator driver

 *

 *  Copyright (C) 2009 Bill Liu <Bill.Liu@Conexant.com>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation; either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY; without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program; if not, write to the Free Software

 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 *

 */



#ifndef __S5H1432_H__
@@ -89,8 +89,3 @@ static inline struct dvb_frontend *s5h1432_attach(const struct s5h1432_config 
#endif /* CONFIG_DVB_s5h1432 */



#endif /* __s5h1432_H__ */
 


/*

 * Local variables:

 * c-basic-offset: 8

 */

drivers/media/video/cx231xx/cx231xx-417.c

+335 −340
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ 


#define  MCI_REGISTER_MODE              0x70



/*Read and write modes

 for polaris ITVC*/

/* Read and write modes for polaris ITVC */

#define  MCI_MODE_REGISTER_READ         0x000

#define  MCI_MODE_REGISTER_WRITE        0x100

#define  MCI_MODE_MEMORY_READ           0x000
@@ -250,20 +249,22 @@ enum cx231xx_mute_video_shift { 
#define IVTV_REG_VPU (0x9058)

#define IVTV_REG_APU (0xA064)



/**** Bit definitions for MC417_RWD and MC417_OEN registers  ***

  bits 31-16

+-----------+

| Reserved  |

+-----------+

  bit 15  bit 14  bit 13 bit 12  bit 11  bit 10  bit 9   bit 8

+-------+-------+-------+-------+-------+-------+-------+-------+

| MIWR# | MIRD# | MICS# |MIRDY# |MIADDR3|MIADDR2|MIADDR1|MIADDR0|

+-------+-------+-------+-------+-------+-------+-------+-------+

 bit 7   bit 6   bit 5   bit 4   bit 3   bit 2   bit 1   bit 0

+-------+-------+-------+-------+-------+-------+-------+-------+

|MIDATA7|MIDATA6|MIDATA5|MIDATA4|MIDATA3|MIDATA2|MIDATA1|MIDATA0|

+-------+-------+-------+-------+-------+-------+-------+-------+

***/

/*

 * Bit definitions for MC417_RWD and MC417_OEN registers

 *

 * bits 31-16

 *+-----------+

 *| Reserved  |

 *|+-----------+

 *|  bit 15  bit 14  bit 13 bit 12  bit 11  bit 10  bit 9   bit 8

 *|+-------+-------+-------+-------+-------+-------+-------+-------+

 *|| MIWR# | MIRD# | MICS# |MIRDY# |MIADDR3|MIADDR2|MIADDR1|MIADDR0|

 *|+-------+-------+-------+-------+-------+-------+-------+-------+

 *| bit 7   bit 6   bit 5   bit 4   bit 3   bit 2   bit 1   bit 0

 *|+-------+-------+-------+-------+-------+-------+-------+-------+

 *||MIDATA7|MIDATA6|MIDATA5|MIDATA4|MIDATA3|MIDATA2|MIDATA1|MIDATA0|

 *|+-------+-------+-------+-------+-------+-------+-------+-------+

 */

#define MC417_MIWR	0x8000

#define MC417_MIRD	0x4000

#define MC417_MICS	0x2000
@@ -272,12 +273,12 @@ enum cx231xx_mute_video_shift { 
#define MC417_MIDATA	0x00FF





/*** Bit definitions for MC417_CTL register ****

 bits 31-6   bits 5-4   bit 3    bits 2-1       Bit 0

+--------+-------------+--------+--------------+------------+

|Reserved|MC417_SPD_CTL|Reserved|MC417_GPIO_SEL|UART_GPIO_EN|

+--------+-------------+--------+--------------+------------+

***/

/* Bit definitions for MC417_CTL register ****

 *bits 31-6   bits 5-4   bit 3    bits 2-1       Bit 0

 *+--------+-------------+--------+--------------+------------+

 *|Reserved|MC417_SPD_CTL|Reserved|MC417_GPIO_SEL|UART_GPIO_EN|

 *+--------+-------------+--------+--------------+------------+

 */

#define MC417_SPD_CTL(x)	(((x) << 4) & 0x00000030)

#define MC417_GPIO_SEL(x)	(((x) << 1) & 0x00000006)

#define MC417_UART_GPIO_EN	0x00000001
@@ -337,6 +338,7 @@ int waitForMciComplete(struct cx231xx *dev) 
	}

	return 0;

}



int mc417_register_write(struct cx231xx *dev, u16 address, u32 value)

{

	u32 temp;
@@ -393,10 +395,8 @@ int mc417_register_write(struct cx231xx *dev, u16 address, u32 value) 
	setITVCReg(dev, ITVC_WRITE_DIR, temp);



	return waitForMciComplete(dev);



}





int mc417_register_read(struct cx231xx *dev, u16 address, u32 *value)

{

	/*write address byte 0;*/
@@ -428,7 +428,6 @@ int mc417_register_read(struct cx231xx *dev, u16 address, u32 *value) 
	signalling that the read is done;*/

	ret = waitForMciComplete(dev);





	/*switch the DATA- GPIO to input mode;*/



	/*Read data byte 0;*/
@@ -476,7 +475,6 @@ int mc417_register_read(struct cx231xx *dev, u16 address, u32 *value) 


int mc417_memory_write(struct cx231xx *dev, u32 address, u32 value)

{



	/*write data byte 0;*/



	u32 temp;
@@ -537,12 +535,10 @@ int mc417_memory_write(struct cx231xx *dev, u32 address, u32 value) 
	waitForMciComplete(dev);



	return 0;



}



int mc417_memory_read(struct cx231xx *dev, u32 address, u32 *value)

{



	u32 temp = 0;

	u32 return_value = 0;

	int ret = 0;
@@ -951,7 +947,6 @@ void mciWriteMemoryToGPIO(struct cx231xx *dev, u32 address, u32 value, 
		*p_fw_image = 0xFFFFFFFF;

		p_fw_image++;

	}



}

drivers/media/video/cx231xx/cx231xx-avcore.c

+65 −70
Original line number Diff line number Diff line
@@ -1349,8 +1349,8 @@ void cx231xx_dump_HH_reg(struct cx231xx *dev) 
	vid_blk_write_word(dev, AFE_CTRL_C2HH_SRC_CTRL, 0x4485D390);

	status = vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value);

	cx231xx_info("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);



}



void cx231xx_dump_SC_reg(struct cx231xx *dev)

{

	u8 value[4] = { 0, 0, 0, 0 };
@@ -1537,7 +1537,6 @@ u32 cx231xx_Get_Colibri_CarrierOffset(u32 mode, u32 standerd) 
{

	u32 colibri_carrier_offset = 0;





	if (mode == TUNER_MODE_FM_RADIO) {

		colibri_carrier_offset = 1100000;

	} else if (standerd & (V4L2_STD_NTSC | V4L2_STD_NTSC_M_JP)) {
@@ -1549,21 +1548,18 @@ u32 cx231xx_Get_Colibri_CarrierOffset(u32 mode, u32 standerd) 
		colibri_carrier_offset = 2100000;  /*2.10MHz	*/

	}





	return colibri_carrier_offset;

}



void cx231xx_set_DIF_bandpass(struct cx231xx *dev, u32 if_freq,

		 u8 spectral_invert, u32 mode)

{



	unsigned long pll_freq_word;

	int status = 0;

	u32 dif_misc_ctrl_value = 0;

	u64 pll_freq_u64 = 0;

	u32 i = 0;





	cx231xx_info("if_freq=%d;spectral_invert=0x%x;mode=0x%x\n",

			 if_freq, spectral_invert, mode);
@@ -1616,7 +1612,6 @@ void cx231xx_set_DIF_bandpass(struct cx231xx *dev, u32 if_freq, 
			Dif_set_array[i].register_address, Dif_set_array[i].value);

		}

	}



}



/******************************************************************************

drivers/media/video/cx231xx/cx231xx-dif.h

+17 −17
Original line number Diff line number Diff line 
/*

   cx231xx-dif.h - driver for Conexant Cx23100/101/102 USB video capture devices



   Copyright {C} 2009 <Bill.Liu@conexant.com>



   This program is free software, you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by

   the Free Software Foundation, either version 2 of the License, or

   (at your option) any later version.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY, without even the implied warranty of

   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

   GNU General Public License for more details.



   You should have received a copy of the GNU General Public License

   along with this program, if not, write to the Free Software

   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 *  cx231xx-dif.h - driver for Conexant Cx23100/101/102 USB video capture devices

 *

 *  Copyright {C} 2009 <Bill.Liu@conexant.com>

 *

 *  This program is free software, you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by

 *  the Free Software Foundation, either version 2 of the License, or

 *  (at your option) any later version.

 *

 *  This program is distributed in the hope that it will be useful,

 *  but WITHOUT ANY WARRANTY, without even the implied warranty of

 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *  GNU General Public License for more details.

 *

 *  You should have received a copy of the GNU General Public License

 *  along with this program, if not, write to the Free Software

 *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 */



#ifndef _CX231XX_DIF_H

drivers/media/video/cx231xx/cx231xx.h

+6 −6

File changed.

Contains only whitespace changes.