[media] drx-j: Use checkpatch --fix to solve several issues

Instead of manually fixing the issues, use the --fix experimental
checkpatch. That solves a bunch of checkpatch issues.
Acked-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

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

@@ -70,10 +70,10 @@ DEFINES
 #define TUNER_MODE_8MHZ    0x4000	/* for 8MHz bandwidth channels        */
 
 #define TUNER_MODE_SUB_MAX 8
-#define TUNER_MODE_SUBALL  (  TUNER_MODE_SUB0 | TUNER_MODE_SUB1 | \
+#define TUNER_MODE_SUBALL  (TUNER_MODE_SUB0 | TUNER_MODE_SUB1 | \
 			      TUNER_MODE_SUB2 | TUNER_MODE_SUB3 | \
 			      TUNER_MODE_SUB4 | TUNER_MODE_SUB5 | \
-			      TUNER_MODE_SUB6 | TUNER_MODE_SUB7 )
+			      TUNER_MODE_SUB6 | TUNER_MODE_SUB7)
 
 /*------------------------------------------------------------------------------
 TYPEDEFS

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

@@ -37,4 +37,4 @@ struct drx39xxj_state {
 
 extern struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c);
 
-#endif // DVB_DUMMY_FE_H
+#endif /* DVB_DUMMY_FE_H */

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

@@ -114,9 +114,9 @@ int DRXBSP_I2C_WriteRead(struct i2c_device_addr *wDevAddr,
 
 	struct i2c_msg msg[2] = {
 		{.addr = wDevAddr->i2cAddr,
-		 .flags = 0,.buf = wData,.len = wCount},
+		 .flags = 0, .buf = wData, .len = wCount},
 		{.addr = rDevAddr->i2cAddr,
-		 .flags = I2C_M_RD,.buf = rData,.len = rCount},
+		 .flags = I2C_M_RD, .buf = rData, .len = rCount},
 	};
 
 	printk("drx3933 i2c operation addr=%x i2c=%p, wc=%x rc=%x\n",

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

@@ -252,29 +252,29 @@ static int DRXDAP_FASI_ReadBlock(struct i2c_device_addr *devAddr,
 		addr &= ~DRXDAP_FASI_FLAGS;
 		addr |= flags;
 
-#if ( ( DRXDAPFASI_LONG_ADDR_ALLOWED==1 ) && \
-      ( DRXDAPFASI_SHORT_ADDR_ALLOWED==1 ) )
+#if (( DRXDAPFASI_LONG_ADDR_ALLOWED == 1) && \
+      (DRXDAPFASI_SHORT_ADDR_ALLOWED == 1) )
 		/* short format address preferred but long format otherwise */
 		if (DRXDAP_FASI_LONG_FORMAT(addr)) {
 #endif
-#if ( DRXDAPFASI_LONG_ADDR_ALLOWED==1 )
+#if (DRXDAPFASI_LONG_ADDR_ALLOWED == 1)
 			buf[bufx++] = (u8) (((addr << 1) & 0xFF) | 0x01);
 			buf[bufx++] = (u8) ((addr >> 16) & 0xFF);
 			buf[bufx++] = (u8) ((addr >> 24) & 0xFF);
 			buf[bufx++] = (u8) ((addr >> 7) & 0xFF);
 #endif
-#if ( ( DRXDAPFASI_LONG_ADDR_ALLOWED==1 ) && \
-      ( DRXDAPFASI_SHORT_ADDR_ALLOWED==1 ) )
+#if (( DRXDAPFASI_LONG_ADDR_ALLOWED == 1) && \
+      (DRXDAPFASI_SHORT_ADDR_ALLOWED == 1) )
 		} else {
 #endif
-#if ( DRXDAPFASI_SHORT_ADDR_ALLOWED==1 )
+#if (DRXDAPFASI_SHORT_ADDR_ALLOWED == 1)
 			buf[bufx++] = (u8) ((addr << 1) & 0xFF);
 			buf[bufx++] =
 			    (u8) (((addr >> 16) & 0x0F) |
 				    ((addr >> 18) & 0xF0));
 #endif
-#if ( ( DRXDAPFASI_LONG_ADDR_ALLOWED==1 ) && \
-      ( DRXDAPFASI_SHORT_ADDR_ALLOWED==1 ) )
+#if (( DRXDAPFASI_LONG_ADDR_ALLOWED == 1) && \
+      (DRXDAPFASI_SHORT_ADDR_ALLOWED == 1) )
 		}
 #endif
 
@@ -332,7 +332,7 @@ static int DRXDAP_FASI_ReadModifyWriteReg16(struct i2c_device_addr *devAddr,
 {
 	int rc = DRX_STS_ERROR;
 
-#if ( DRXDAPFASI_LONG_ADDR_ALLOWED==1 )
+#if (DRXDAPFASI_LONG_ADDR_ALLOWED == 1)
 	if (rdata == NULL) {
 		return DRX_STS_INVALID_ARG;
 	}
@@ -478,29 +478,29 @@ static int DRXDAP_FASI_WriteBlock(struct i2c_device_addr *devAddr,
 		/* Buffer device address */
 		addr &= ~DRXDAP_FASI_FLAGS;
 		addr |= flags;
-#if ( ( (DRXDAPFASI_LONG_ADDR_ALLOWED)==1 ) && \
-      ( (DRXDAPFASI_SHORT_ADDR_ALLOWED)==1 ) )
+#if (( (DRXDAPFASI_LONG_ADDR_ALLOWED) == 1) && \
+      ((DRXDAPFASI_SHORT_ADDR_ALLOWED) == 1) )
 		/* short format address preferred but long format otherwise */
 		if (DRXDAP_FASI_LONG_FORMAT(addr)) {
 #endif
-#if ( (DRXDAPFASI_LONG_ADDR_ALLOWED)==1 )
+#if ((DRXDAPFASI_LONG_ADDR_ALLOWED) == 1)
 			buf[bufx++] = (u8) (((addr << 1) & 0xFF) | 0x01);
 			buf[bufx++] = (u8) ((addr >> 16) & 0xFF);
 			buf[bufx++] = (u8) ((addr >> 24) & 0xFF);
 			buf[bufx++] = (u8) ((addr >> 7) & 0xFF);
 #endif
-#if ( ( (DRXDAPFASI_LONG_ADDR_ALLOWED)==1 ) && \
-      ( (DRXDAPFASI_SHORT_ADDR_ALLOWED)==1 ) )
+#if (( (DRXDAPFASI_LONG_ADDR_ALLOWED) == 1) && \
+      ((DRXDAPFASI_SHORT_ADDR_ALLOWED) == 1) )
 		} else {
 #endif
-#if ( (DRXDAPFASI_SHORT_ADDR_ALLOWED)==1 )
+#if ((DRXDAPFASI_SHORT_ADDR_ALLOWED) == 1)
 			buf[bufx++] = (u8) ((addr << 1) & 0xFF);
 			buf[bufx++] =
 			    (u8) (((addr >> 16) & 0x0F) |
 				    ((addr >> 18) & 0xF0));
 #endif
-#if ( ( (DRXDAPFASI_LONG_ADDR_ALLOWED)==1 ) && \
-      ( (DRXDAPFASI_SHORT_ADDR_ALLOWED)==1 ) )
+#if (( (DRXDAPFASI_LONG_ADDR_ALLOWED) == 1) && \
+      ((DRXDAPFASI_SHORT_ADDR_ALLOWED) == 1) )
 		}
 #endif
 

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

@@ -83,18 +83,18 @@
 */
 
 /* set default */
-#if !defined( DRXDAPFASI_LONG_ADDR_ALLOWED )
+#if !defined(DRXDAPFASI_LONG_ADDR_ALLOWED)
 #define  DRXDAPFASI_LONG_ADDR_ALLOWED 1
 #endif
 
 /* set default */
-#if !defined( DRXDAPFASI_SHORT_ADDR_ALLOWED )
+#if !defined(DRXDAPFASI_SHORT_ADDR_ALLOWED)
 #define  DRXDAPFASI_SHORT_ADDR_ALLOWED 1
 #endif
 
 /* check */
-#if ( ( DRXDAPFASI_LONG_ADDR_ALLOWED==0 ) && \
-      ( DRXDAPFASI_SHORT_ADDR_ALLOWED==0 ) )
+#if (( DRXDAPFASI_LONG_ADDR_ALLOWED == 0) && \
+      (DRXDAPFASI_SHORT_ADDR_ALLOWED == 0) )
 #error  At least one of short- or long-addressing format must be allowed.
 *;				/* illegal statement to force compiler error */
 #endif
@@ -176,12 +176,12 @@
 */
 
 /* set default */
-#if !defined( DRXDAP_MAX_WCHUNKSIZE)
+#if !defined(DRXDAP_MAX_WCHUNKSIZE)
 #define  DRXDAP_MAX_WCHUNKSIZE 254
 #endif
 
 /* check */
-#if ( (DRXDAPFASI_LONG_ADDR_ALLOWED==0)&&(DRXDAPFASI_SHORT_ADDR_ALLOWED==1) )
+#if ((DRXDAPFASI_LONG_ADDR_ALLOWED == 0) && (DRXDAPFASI_SHORT_ADDR_ALLOWED == 1))
 #if DRXDAP_SINGLE_MASTER
 #define  DRXDAP_MAX_WCHUNKSIZE_MIN 3
 #else
@@ -196,7 +196,7 @@
 #endif
 
 #if  DRXDAP_MAX_WCHUNKSIZE <  DRXDAP_MAX_WCHUNKSIZE_MIN
-#if ( (DRXDAPFASI_LONG_ADDR_ALLOWED==0)&&(DRXDAPFASI_SHORT_ADDR_ALLOWED==1) )
+#if ((DRXDAPFASI_LONG_ADDR_ALLOWED == 0) && (DRXDAPFASI_SHORT_ADDR_ALLOWED == 1))
 #if DRXDAP_SINGLE_MASTER
 #error  DRXDAP_MAX_WCHUNKSIZE must be at least 3 in single master mode
 *;				/* illegal statement to force compiler error */
@@ -216,7 +216,7 @@
 #endif
 
 /* set default */
-#if !defined( DRXDAP_MAX_RCHUNKSIZE)
+#if !defined(DRXDAP_MAX_RCHUNKSIZE)
 #define  DRXDAP_MAX_RCHUNKSIZE 254
 #endif
 
@@ -249,13 +249,13 @@ extern "C" {
 #define DRXDAP_FASI_MODEFLAGS     0xC0000000
 #define DRXDAP_FASI_FLAGS         0xF0000000
 
-#define DRXDAP_FASI_ADDR2BLOCK( addr )  (((addr)>>22)&0x3F)
-#define DRXDAP_FASI_ADDR2BANK( addr )   (((addr)>>16)&0x3F)
-#define DRXDAP_FASI_ADDR2OFFSET( addr ) ((addr)&0x7FFF)
+#define DRXDAP_FASI_ADDR2BLOCK(addr)  (((addr)>>22)&0x3F)
+#define DRXDAP_FASI_ADDR2BANK(addr)   (((addr)>>16)&0x3F)
+#define DRXDAP_FASI_ADDR2OFFSET(addr) ((addr)&0x7FFF)
 
-#define DRXDAP_FASI_SHORT_FORMAT( addr )     (((addr)& 0xFC30FF80)==0)
-#define DRXDAP_FASI_LONG_FORMAT( addr )      (((addr)& 0xFC30FF80)!=0)
-#define DRXDAP_FASI_OFFSET_TOO_LARGE( addr ) (((addr)& 0x00008000)!=0)
+#define DRXDAP_FASI_SHORT_FORMAT(addr)     (((addr) & 0xFC30FF80) == 0)
+#define DRXDAP_FASI_LONG_FORMAT(addr)      (((addr) & 0xFC30FF80) != 0)
+#define DRXDAP_FASI_OFFSET_TOO_LARGE(addr) (((addr) & 0x00008000) != 0)
 
 #ifdef __cplusplus
 }

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

@@ -99,15 +99,15 @@ DEFINES
 /*=== MACROS =================================================================*/
 /*============================================================================*/
 
-#define DRX_ISPOWERDOWNMODE( mode ) (  ( mode == DRX_POWER_MODE_9  ) || \
-				       ( mode == DRX_POWER_MODE_10 ) || \
-				       ( mode == DRX_POWER_MODE_11 ) || \
-				       ( mode == DRX_POWER_MODE_12 ) || \
-				       ( mode == DRX_POWER_MODE_13 ) || \
-				       ( mode == DRX_POWER_MODE_14 ) || \
-				       ( mode == DRX_POWER_MODE_15 ) || \
-				       ( mode == DRX_POWER_MODE_16 ) || \
-				       ( mode == DRX_POWER_DOWN    ) )
+#define DRX_ISPOWERDOWNMODE(mode) (  ( mode == DRX_POWER_MODE_9  ) || \
+				       (mode == DRX_POWER_MODE_10) || \
+				       (mode == DRX_POWER_MODE_11) || \
+				       (mode == DRX_POWER_MODE_12) || \
+				       (mode == DRX_POWER_MODE_13) || \
+				       (mode == DRX_POWER_MODE_14) || \
+				       (mode == DRX_POWER_MODE_15) || \
+				       (mode == DRX_POWER_MODE_16) || \
+				       (mode == DRX_POWER_DOWN) )
 
 /*------------------------------------------------------------------------------
 GLOBAL VARIABLES
@@ -148,7 +148,7 @@ FUNCTIONS
 static int
 ScanFunctionDefault(void *scanContext,
 		    DRXScanCommand_t scanCommand,
-		    pDRXChannel_t scanChannel, bool * getNextChannel);
+		    pDRXChannel_t scanChannel, bool *getNextChannel);
 
 /**
 * \brief Get pointer to scanning function.
@@ -211,7 +211,7 @@ void *GetScanContext(pDRXDemodInstance_t demod, void *scanContext)
 * In case DRX_NEVER_LOCK is returned the poll-wait will be aborted.
 *
 */
-static int ScanWaitForLock(pDRXDemodInstance_t demod, bool * isLocked)
+static int ScanWaitForLock(pDRXDemodInstance_t demod, bool *isLocked)
 {
 	bool doneWaiting = false;
 	DRXLockStatus_t lockState = DRX_NOT_LOCKED;
@@ -356,7 +356,7 @@ ScanPrepareNextScan(pDRXDemodInstance_t demod, s32 skip)
 static int
 ScanFunctionDefault(void *scanContext,
 		    DRXScanCommand_t scanCommand,
-		    pDRXChannel_t scanChannel, bool * getNextChannel)
+		    pDRXChannel_t scanChannel, bool *getNextChannel)
 {
 	pDRXDemodInstance_t demod = NULL;
 	int status = DRX_STS_ERROR;
@@ -604,7 +604,7 @@ static int CtrlScanStop(pDRXDemodInstance_t demod)
 static int CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress)
 {
 	pDRXCommonAttr_t commonAttr = (pDRXCommonAttr_t) (NULL);
-	bool * scanReady = (bool *) (NULL);
+	bool *scanReady = (bool *) (NULL);
 	u16 maxProgress = DRX_SCAN_MAX_PROGRESS;
 	u32 numTries = 0;
 	u32 i = 0;
@@ -1202,7 +1202,7 @@ CtrlUCode(pDRXDemodInstance_t demod,
 * \retval DRX_STS_INVALID_ARG: Invalid arguments.
 */
 static int
-CtrlVersion(pDRXDemodInstance_t demod, pDRXVersionList_t * versionList)
+CtrlVersion(pDRXDemodInstance_t demod, pDRXVersionList_t *versionList)
 {
 	static char drxDriverCoreModuleName[] = "Core driver";
 	static char drxDriverCoreVersionText[] =

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

@@ -53,7 +53,7 @@ extern "C" {
 /* Multi master mode and short addr format only will not work.
    RMW, CRC reset, broadcast and switching back to single master mode
    cannot be done with short addr only in multi master mode. */
-#if ((DRXDAP_SINGLE_MASTER==0)&&(DRXDAPFASI_LONG_ADDR_ALLOWED==0))
+#if ((DRXDAP_SINGLE_MASTER == 0) && (DRXDAPFASI_LONG_ADDR_ALLOWED == 0))
 #error "Multi master mode and short addressing only is an illegal combination"
 	*;			/* Generate a fatal compiler error to make sure it stops here,
 				   this is necesarry because not all compilers stop after a #error. */
@@ -590,7 +590,7 @@ Access MACROS
 *
 */
 
-#define DRXJ_ATTR_BTSC_DETECT( d )                       \
+#define DRXJ_ATTR_BTSC_DETECT(d)                       \
 			(((pDRXJData_t)(d)->myExtAttr)->audData.btscDetect)
 
 /**
@@ -604,15 +604,15 @@ Access MACROS
 * substituted by "direct-access-inline-code" or a function call.
 *
 */
-#define DRXJ_GET_BTSC_DETECT( d, x )                     \
+#define DRXJ_GET_BTSC_DETECT(d, x)                     \
    do {                                                  \
-      (x) = DRXJ_ATTR_BTSC_DETECT(( d );                 \
-   } while(0)
+      (x) = DRXJ_ATTR_BTSC_DETECT((d);                 \
+   } while (0)
 
-#define DRXJ_SET_BTSC_DETECT( d, x )                     \
+#define DRXJ_SET_BTSC_DETECT(d, x)                     \
    do {                                                  \
-      DRXJ_ATTR_BTSC_DETECT( d ) = (x);                  \
-   } while(0)
+      DRXJ_ATTR_BTSC_DETECT(d) = (x);                  \
+   } while (0)
 
 /*-------------------------------------------------------------------------
 DEFINES
@@ -704,12 +704,12 @@ DEFINES
 
 /* Convert OOB lock status to string */
 #define DRXJ_STR_OOB_LOCKSTATUS(x) ( \
-   ( x == DRX_NEVER_LOCK               )  ?  "Never"           : \
-   ( x == DRX_NOT_LOCKED               )  ?  "No"              : \
-   ( x == DRX_LOCKED                   )  ?  "Locked"          : \
-   ( x == DRX_LOCK_STATE_1             )  ?  "AGC lock"        : \
-   ( x == DRX_LOCK_STATE_2             )  ?  "sync lock"       : \
-					     "(Invalid)" )
+   (x == DRX_NEVER_LOCK)  ?  "Never"           : \
+   (x == DRX_NOT_LOCKED)  ?  "No"              : \
+   (x == DRX_LOCKED)  ?  "Locked"          : \
+   (x == DRX_LOCK_STATE_1)  ?  "AGC lock"        : \
+   (x == DRX_LOCK_STATE_2)  ?  "sync lock"       : \
+					     "(Invalid)")
 
 /*-------------------------------------------------------------------------
 ENUM