From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Fri, 17 Jan 2014 10:12:28 +0000 (-0300)
Subject: [media] drx-j: CodingStyle fixups on drxj.c
X-Git-Tag: v3.15-rc1~85^2~273
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6371351777640bffe63d37edbba226116d4d7034;p=pandora-kernel.git

[media] drx-j: CodingStyle fixups on drxj.c

Fix almost all checkpatch.pl warnings/errors on drxj.c, except for:
- 80 cols whitespacing;
- too many leading tabs;
- a false positive at DRXJ_16TO8() macro.
- static char array declaration should probably be static const char
  as adding "const" would cause warnings.

Acked-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

diff --git a/drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.c b/drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.c
index 6053878a637c..4671dccfebb9 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drx_dap_fasi.c
@@ -284,9 +284,8 @@ static int drxdap_fasi_read_block(struct i2c_device_addr *dev_addr,
 		 * No special action is needed for write chunks here.
 		 */
 		rc = drxbsp_i2c_write_read(dev_addr, bufx, buf, 0, 0, 0);
-		if (rc == DRX_STS_OK) {
+		if (rc == DRX_STS_OK)
 			rc = drxbsp_i2c_write_read(0, 0, 0, dev_addr, todo, data);
-		}
 #else
 		/* In multi master mode, do everything in one RW action */
 		rc = drxbsp_i2c_write_read(dev_addr, bufx, buf, dev_addr, todo,
@@ -338,9 +337,8 @@ static int drxdap_fasi_read_modify_write_reg16(struct i2c_device_addr *dev_addr,
 	}
 
 	rc = drxdap_fasi_write_reg16(dev_addr, waddr, wdata, DRXDAP_FASI_RMW);
-	if (rc == DRX_STS_OK) {
+	if (rc == DRX_STS_OK)
 		rc = drxdap_fasi_read_reg16(dev_addr, raddr, rdata, 0);
-	}
 #endif
 
 	return rc;
diff --git a/drivers/media/dvb-frontends/drx39xyj/drx_driver.c b/drivers/media/dvb-frontends/drx39xyj/drx_driver.c
index d1d9ded65407..4234b7d46d18 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drx_driver.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drx_driver.c
@@ -186,9 +186,8 @@ static void *get_scan_context(struct drx_demod_instance *demod, void *scan_conte
 	common_attr = (struct drx_common_attr *) demod->my_common_attr;
 	scan_context = common_attr->scan_context;
 
-	if (scan_context == NULL) {
+	if (scan_context == NULL)
 		scan_context = (void *)demod;
-	}
 
 	return scan_context;
 }
@@ -482,10 +481,8 @@ ctrl_scan_init(struct drx_demod_instance *demod, struct drx_scan_param *scan_par
 					s32 n = 0;
 
 					n = (min_tuner_freq - first_freq) / step;
-					if (((min_tuner_freq -
-					      first_freq) % step) != 0) {
+					if (((min_tuner_freq - first_freq) % step) != 0)
 						n++;
-					}
 					min_freq = first_freq + n * step;
 				}
 
@@ -495,10 +492,8 @@ ctrl_scan_init(struct drx_demod_instance *demod, struct drx_scan_param *scan_par
 					s32 n = 0;
 
 					n = (last_freq - max_tuner_freq) / step;
-					if (((last_freq -
-					      max_tuner_freq) % step) != 0) {
+					if (((last_freq - max_tuner_freq) % step) != 0)
 						n++;
-					}
 					max_freq = last_freq - n * step;
 				}
 			}
@@ -950,9 +945,8 @@ static u16 u_code_compute_crc(u8 *block_data, u16 nr_words)
 		crc_word |= (u32) u_code_read16(block_data);
 		for (j = 0; j < 16; j++) {
 			crc_word <<= 1;
-			if (carry != 0) {
+			if (carry != 0)
 				crc_word ^= 0x80050000UL;
-			}
 			carry = crc_word & 0x80000000UL;
 		}
 		i++;
@@ -1320,9 +1314,8 @@ int drx_open(struct drx_demod_instance *demod)
 
 	status = (*(demod->my_demod_funct->open_func)) (demod);
 
-	if (status == DRX_STS_OK) {
+	if (status == DRX_STS_OK)
 		demod->my_common_attr->is_opened = true;
-	}
 
 	return status;
 }
Reading git-diff-tree failed