Commit 443f18d0 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] drx-j: CodingStyle fixes 



Do the automatic CodingStyle fixes found at Lindent.

No functional changes.

Acked-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent ca3355a9

drivers/media/dvb-frontends/drx39xyj/bsp_host.h

+7 −9
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ extern "C" { 
TYPEDEFS

-------------------------------------------------------------------------*/





/*-------------------------------------------------------------------------

DEFINES

-------------------------------------------------------------------------*/
@@ -76,5 +75,4 @@ THE END 
#ifdef __cplusplus

}

#endif



#endif				/* __DRXBSP_HOST_H__ */

drivers/media/dvb-frontends/drx39xyj/bsp_i2c.h

+22 −24
Original line number Diff line number Diff line
@@ -82,9 +82,12 @@ typedef u16_t I2CdevId_t; 
*

*/

	struct _I2CDeviceAddr_t {

   I2Caddr_t  i2cAddr;        /**< The I2C address of the device. */

   I2CdevId_t i2cDevId;       /**< The device identifier. */

   void       *userData;      /**< User data pointer */

		I2Caddr_t i2cAddr;

			      /**< The I2C address of the device. */

		I2CdevId_t i2cDevId;

			      /**< The device identifier. */

		void *userData;

			      /**< User data pointer */

	};



/**
@@ -133,7 +136,6 @@ STRUCTS 
Exported FUNCTIONS

------------------------------------------------------------------------------*/





/**

* \fn DRXBSP_I2C_Init()

* \brief Initialize I2C communication module.
@@ -143,7 +145,6 @@ Exported FUNCTIONS 
*/

	DRXStatus_t DRXBSP_I2C_Init(void);





/**

* \fn DRXBSP_I2C_Term()

* \brief Terminate I2C communication module.
@@ -187,9 +188,7 @@ DRXStatus_t DRXBSP_I2C_WriteRead( pI2CDeviceAddr_t wDevAddr, 
					 u16_t wCount,

					 pu8_t wData,

					 pI2CDeviceAddr_t rDevAddr,

				    u16_t            rCount,

				    pu8_t            rData);



					 u16_t rCount, pu8_t rData);



/**

* \fn DRXBSP_I2C_ErrorText()
@@ -206,7 +205,6 @@ char* DRXBSP_I2C_ErrorText( void ); 
*/

	extern int DRX_I2C_Error_g;





/*------------------------------------------------------------------------------

THE END

------------------------------------------------------------------------------*/

drivers/media/dvb-frontends/drx39xyj/bsp_tuner.h

+106 −112
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ extern "C" { 
DEFINES

------------------------------------------------------------------------------*/





	/* Sub-mode bits should be adjacent and incremental */

#define TUNER_MODE_SUB0    0x0001	/* for sub-mode (e.g. RF-AGC setting) */

#define TUNER_MODE_SUB1    0x0002	/* for sub-mode (e.g. RF-AGC setting) */
@@ -86,15 +85,12 @@ typedef pu32_t pTUNERMode_t; 
	typedef char *TUNERSubMode_t;	/* description of submode */

	typedef TUNERSubMode_t *pTUNERSubMode_t;





	typedef enum {



		TUNER_LOCKED,

		TUNER_NOT_LOCKED



	} TUNERLockStatus_t, *pTUNERLockStatus_t;





	typedef struct {



		char *name;	/* Tuner brand & type name */
@@ -117,7 +113,6 @@ typedef struct { 


	} TUNERCommonAttr_t, *pTUNERCommonAttr_t;





/*

* Generic functions for DRX devices.

*/
@@ -128,26 +123,29 @@ typedef DRXStatus_t (*TUNERCloseFunc_t)( pTUNERInstance_t tuner ); 


	typedef DRXStatus_t(*TUNERSetFrequencyFunc_t) (pTUNERInstance_t tuner,

						       TUNERMode_t mode,

						DRXFrequency_t    frequency );

						       DRXFrequency_t

						       frequency);



	typedef DRXStatus_t(*TUNERGetFrequencyFunc_t) (pTUNERInstance_t tuner,

						       TUNERMode_t mode,

						pDRXFrequency_t   RFfrequency,

						pDRXFrequency_t   IFfrequency );

						       pDRXFrequency_t

						       RFfrequency,

						       pDRXFrequency_t

						       IFfrequency);



	typedef DRXStatus_t(*TUNERLockStatusFunc_t) (pTUNERInstance_t tuner,

						pTUNERLockStatus_t lockStat );

						     pTUNERLockStatus_t

						     lockStat);



	typedef DRXStatus_t(*TUNERi2cWriteReadFunc_t) (pTUNERInstance_t tuner,

						pI2CDeviceAddr_t  wDevAddr,

						u16_t             wCount,

						       pI2CDeviceAddr_t

						       wDevAddr, u16_t wCount,

						       pu8_t wData,

						pI2CDeviceAddr_t  rDevAddr,

						u16_t             rCount,

						       pI2CDeviceAddr_t

						       rDevAddr, u16_t rCount,

						       pu8_t rData);



typedef struct

{

	typedef struct {

		TUNEROpenFunc_t openFunc;

		TUNERCloseFunc_t closeFunc;

		TUNERSetFrequencyFunc_t setFrequencyFunc;
@@ -166,7 +164,6 @@ typedef struct TUNERInstance_s { 


	} TUNERInstance_t;





/*------------------------------------------------------------------------------

ENUM

------------------------------------------------------------------------------*/
@@ -175,7 +172,6 @@ ENUM 
STRUCTS

------------------------------------------------------------------------------*/





/*------------------------------------------------------------------------------

Exported FUNCTIONS

------------------------------------------------------------------------------*/
@@ -201,8 +197,7 @@ DRXStatus_t DRXBSP_TUNER_DefaultI2CWriteRead( pTUNERInstance_t tuner, 
						     u16_t wCount,

						     pu8_t wData,

						     pI2CDeviceAddr_t rDevAddr,

						u16_t            rCount,

						pu8_t            rData);

						     u16_t rCount, pu8_t rData);



/*------------------------------------------------------------------------------

THE END
@@ -211,5 +206,4 @@ THE END 
}

#endif

#endif				/* __DRXBSP_TUNER_H__ */



/* End of file */

drivers/media/dvb-frontends/drx39xyj/bsp_types.h

+43 −43
Original line number Diff line number Diff line
@@ -140,7 +140,6 @@ typedef u64_t *pu64_t; 
*/

	typedef s64_t *ps64_t;





/**

* \typedef s32_t DRXFrequency_t

* \brief type definition of frequency
@@ -205,12 +204,13 @@ typedef enum { 
		DRX_STS_READY = 3,  /**< device/service is ready     */

		DRX_STS_BUSY = 2,   /**< device/service is busy      */

		DRX_STS_OK = 1,	    /**< everything is OK            */

   DRX_STS_INVALID_ARG = -1,        /**< invalid arguments           */

		DRX_STS_INVALID_ARG = -1,

				    /**< invalid arguments           */

		DRX_STS_ERROR = -2, /**< general error               */

   DRX_STS_FUNC_NOT_AVAILABLE = -3  /**< unavailable functionality   */

		DRX_STS_FUNC_NOT_AVAILABLE = -3

				    /**< unavailable functionality   */

	} DRXStatus_t, *pDRXStatus_t;





/*-------------------------------------------------------------------------

STRUCTS

-------------------------------------------------------------------------*/

drivers/media/dvb-frontends/drx39xyj/drx39xxj.c

+84 −84
Original line number Diff line number Diff line
@@ -87,16 +87,12 @@ static int drx39xxj_read_status(struct dvb_frontend* fe, fe_status_t* status) 
	case DRX_LOCK_STATE_8:

	case DRX_LOCK_STATE_9:

		*status = FE_HAS_SIGNAL

			| FE_HAS_CARRIER

			| FE_HAS_VITERBI

			| FE_HAS_SYNC;

		    | FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC;

		break;

	case DRX_LOCKED:

		*status = FE_HAS_SIGNAL

		    | FE_HAS_CARRIER

			| FE_HAS_VITERBI

			| FE_HAS_SYNC

			| FE_HAS_LOCK;

		    | FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;

		break;

	default:

		printk("Lock state unknown %d\n", lock_status);
@@ -123,7 +119,8 @@ static int drx39xxj_read_ber(struct dvb_frontend* fe, u32* ber) 
	return 0;

}



static int drx39xxj_read_signal_strength(struct dvb_frontend* fe, u16* strength)

static int drx39xxj_read_signal_strength(struct dvb_frontend *fe,

					 u16 * strength)

{

	struct drx39xxj_state *state = fe->demodulator_priv;

	DRXDemodInstance_t *demod = state->demod;
@@ -178,12 +175,14 @@ static int drx39xxj_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) 
	return 0;

}



static int drx39xxj_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)

static int drx39xxj_get_frontend(struct dvb_frontend *fe,

				 struct dvb_frontend_parameters *p)

{

	return 0;

}



static int drx39xxj_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)

static int drx39xxj_set_frontend(struct dvb_frontend *fe,

				 struct dvb_frontend_parameters *p)

{

#ifdef DJH_DEBUG

	int i;
@@ -246,7 +245,6 @@ static int drx39xxj_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa 
		printk("Failed to set channel!\n");

		return -EINVAL;

	}



	// Just for giggles, let's shut off the LNA again....

	uioData.uio = DRX_UIO1;

	uioData.value = FALSE;
@@ -255,7 +253,6 @@ static int drx39xxj_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa 
		printk("Failed to disable LNA!\n");

		return 0;

	}



#ifdef DJH_DEBUG

	for (i = 0; i < 2000; i++) {

		fe_status_t status;
@@ -269,7 +266,6 @@ static int drx39xxj_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa 
	return 0;

}





static int drx39xxj_sleep(struct dvb_frontend *fe)

{

	/* power-down the demodulator */
@@ -308,7 +304,6 @@ static int drx39xxj_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) 
	return 0;

}





static int drx39xxj_init(struct dvb_frontend *fe)

{

	/* Bring the demod out of sleep */
@@ -346,19 +341,24 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c) 


	/* allocate memory for the internal state */

	state = kmalloc(sizeof(struct drx39xxj_state), GFP_KERNEL);

	if (state == NULL) goto error;

	if (state == NULL)

		goto error;



	demod = kmalloc(sizeof(DRXDemodInstance_t), GFP_KERNEL);

	if (demod == NULL) goto error;

	if (demod == NULL)

		goto error;



	demodAddr = kmalloc(sizeof(I2CDeviceAddr_t), GFP_KERNEL);

	if (demodAddr == NULL) goto error;

	if (demodAddr == NULL)

		goto error;



	demodCommAttr = kmalloc(sizeof(DRXCommonAttr_t), GFP_KERNEL);

	if (demodCommAttr == NULL) goto error;

	if (demodCommAttr == NULL)

		goto error;



	demodExtAttr = kmalloc(sizeof(DRXJData_t), GFP_KERNEL);

	if (demodExtAttr == NULL) goto error;

	if (demodExtAttr == NULL)

		goto error;



	/* setup the state */

	state->i2c = i2c;
@@ -380,7 +380,8 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c) 


	demod->myExtAttr = demodExtAttr;

	memcpy(demod->myExtAttr, &DRXJData_g, sizeof(DRXJData_t));

	((DRXJData_t *) demod->myExtAttr)->uioSmaTxMode = DRX_UIO_MODE_READWRITE;

	((DRXJData_t *) demod->myExtAttr)->uioSmaTxMode =

	    DRX_UIO_MODE_READWRITE;



	demod->myTuner = NULL;
@@ -432,8 +433,7 @@ static struct dvb_frontend_ops drx39xxj_ops = { 
		 .frequency_stepsize = 62500,

		 .frequency_min = 51000000,

		 .frequency_max = 858000000,

		.caps = FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB

	},

		 .caps = FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB},



	.init = drx39xxj_init,

	.i2c_gate_ctrl = drx39xxj_i2c_gate_ctrl,