The patch number 13253 was added via a...@morgan.walls.org
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Andy Walls <awa...@radix.net>
cx23885: CodingStyle - whitespace around binary operators in cx23888-ir.c
Priority: normal
Signed-off-by: Andy Walls <awa...@radix.net>
---
linux/drivers/media/video/cx23885/cx23888-ir.c | 43 ++++++++---------
1 file changed, 22 insertions(+), 21 deletions(-)
diff -r b05a093688a2 -r 39bd5835062c
linux/drivers/media/video/cx23885/cx23888-ir.c
--- a/linux/drivers/media/video/cx23885/cx23888-ir.c Sun Sep 27 19:55:41
2009 -0400
+++ b/linux/drivers/media/video/cx23885/cx23888-ir.c Thu Oct 29 21:24:34
2009 -0400
@@ -108,7 +108,7 @@
#define CX23888_IR_LEARN_REG 0x170044
#define CX23888_VIDCLK_FREQ 108000000 /* 108 MHz, BT.656 */
-#define CX23888_IR_REFCLK_FREQ (CX23888_VIDCLK_FREQ/2)
+#define CX23888_IR_REFCLK_FREQ (CX23888_VIDCLK_FREQ / 2)
#define CX23888_IR_RX_KFIFO_SIZE (512 * sizeof(u32))
#define CX23888_IR_TX_KFIFO_SIZE (512 * sizeof(u32))
@@ -171,7 +171,7 @@
*/
static inline u16 count_to_clock_divider(unsigned int d)
{
- if (d > RXCLK_RCD+1)
+ if (d > RXCLK_RCD + 1)
d = RXCLK_RCD;
else if (d < 2)
d = 1;
@@ -183,14 +183,14 @@
static inline u16 ns_to_clock_divider(unsigned int ns)
{
return count_to_clock_divider(
- DIV_ROUND_CLOSEST(CX23888_IR_REFCLK_FREQ/1000000 * ns, 1000));
+ DIV_ROUND_CLOSEST(CX23888_IR_REFCLK_FREQ / 1000000 * ns, 1000));
}
static inline unsigned int clock_divider_to_ns(unsigned int divider)
{
/* Period of the Rx or Tx clock in ns */
return DIV_ROUND_CLOSEST((divider + 1) * 1000,
- CX23888_IR_REFCLK_FREQ/1000000);
+ CX23888_IR_REFCLK_FREQ / 1000000);
}
static inline u16 carrier_freq_to_clock_divider(unsigned int freq)
@@ -237,19 +237,20 @@
static inline u16 ns_to_lpf_count(unsigned int ns)
{
return count_to_lpf_count(
- DIV_ROUND_CLOSEST(CX23888_IR_REFCLK_FREQ/1000000 * ns, 1000));
+ DIV_ROUND_CLOSEST(CX23888_IR_REFCLK_FREQ / 1000000 * ns, 1000));
}
static inline unsigned int lpf_count_to_ns(unsigned int count)
{
/* Duration of the Low Pass Filter rejection window in ns */
- return DIV_ROUND_CLOSEST(count * 1000, CX23888_IR_REFCLK_FREQ/1000000);
+ return DIV_ROUND_CLOSEST(count * 1000,
+ CX23888_IR_REFCLK_FREQ / 1000000);
}
static inline unsigned int lpf_count_to_us(unsigned int count)
{
/* Duration of the Low Pass Filter rejection window in us */
- return DIV_ROUND_CLOSEST(count, CX23888_IR_REFCLK_FREQ/1000000);
+ return DIV_ROUND_CLOSEST(count, CX23888_IR_REFCLK_FREQ / 1000000);
}
/*
@@ -263,7 +264,7 @@
* not readable, hence the << 2. This function returns ns.
*/
return DIV_ROUND_CLOSEST((1 << 2) * ((u32) divider + 1) * 1000,
- CX23888_IR_REFCLK_FREQ/1000000);
+ CX23888_IR_REFCLK_FREQ / 1000000);
}
static u64 pulse_width_count_to_ns(u16 count, u16 divider)
@@ -276,8 +277,8 @@
* the (count << 2) | 0x3
*/
n = (((u64) count << 2) | 0x3) * (divider + 1) * 1000; /* millicycles */
- rem = do_div(n, CX23888_IR_REFCLK_FREQ/1000000); /* / MHz => ns */
- if (rem >= CX23888_IR_REFCLK_FREQ/1000000/2)
+ rem = do_div(n, CX23888_IR_REFCLK_FREQ / 1000000); /* / MHz => ns */
+ if (rem >= CX23888_IR_REFCLK_FREQ / 1000000 / 2)
n++;
return n;
}
@@ -294,10 +295,10 @@
* The 2 lsb's of the pulse width timer count are not accessable, hence
* the (1 << 2)
*/
- n = ((u64) ns) * CX23888_IR_REFCLK_FREQ/1000000; /* millicycles */
+ n = ((u64) ns) * CX23888_IR_REFCLK_FREQ / 1000000; /* millicycles */
d = (1 << 2) * ((u32) divider + 1) * 1000; /* millicycles/count */
rem = do_div(n, d);
- if (rem >= d/2)
+ if (rem >= d / 2)
n++;
if (n > FIFO_RXTX)
@@ -317,9 +318,9 @@
* The 2 lsb's of the pulse width timer count are not readable, hence
* the (count << 2) | 0x3
*/
- n = (((u64) count << 2) | 0x3) * (divider + 1); /* cycles */
- rem = do_div(n, CX23888_IR_REFCLK_FREQ/1000000); /* / MHz => us */
- if (rem >= CX23888_IR_REFCLK_FREQ/1000000/2)
+ n = (((u64) count << 2) | 0x3) * (divider + 1); /* cycles */
+ rem = do_div(n, CX23888_IR_REFCLK_FREQ / 1000000); /* / MHz => us */
+ if (rem >= CX23888_IR_REFCLK_FREQ / 1000000 / 2)
n++;
return (unsigned int) n;
}
@@ -336,9 +337,9 @@
{
u64 clocks;
u32 rem;
- clocks = CX23888_IR_REFCLK_FREQ/1000000 * (u64) ns; /* millicycles */
+ clocks = CX23888_IR_REFCLK_FREQ / 1000000 * (u64) ns; /* millicycles */
rem = do_div(clocks, 1000); /* /1000 = cycles */
- if (rem >= 1000/2)
+ if (rem >= 1000 / 2)
clocks++;
return clocks;
}
@@ -350,7 +351,7 @@
rem = do_div(count, (FIFO_RXTX << 2) | 0x3);
/* net result needs to be rounded down and decremented by 1 */
- if (count > RXCLK_RCD+1)
+ if (count > RXCLK_RCD + 1)
count = RXCLK_RCD;
else if (count < 2)
count = 1;
@@ -510,7 +511,7 @@
if (n > 15)
n = 15;
cx23888_ir_write4(dev, CX23888_IR_CDUTY_REG, n);
- return DIV_ROUND_CLOSEST((n+1) * 100, 16);
+ return DIV_ROUND_CLOSEST((n + 1) * 100, 16);
}
/*
@@ -656,7 +657,7 @@
cx23888_ir_write4(dev, CX23888_IR_CNTRL_REG, cntrl);
*handled = true;
}
- if (kfifo_len(state->rx_kfifo) >= CX23888_IR_RX_KFIFO_SIZE/2)
+ if (kfifo_len(state->rx_kfifo) >= CX23888_IR_RX_KFIFO_SIZE / 2)
events |= V4L2_SUBDEV_IR_RX_FIFO_SERVICE_REQ;
if (events)
@@ -851,7 +852,7 @@
* check hardware fifo level, and other stuff
*/
for (i = 0; i < n; ) {
- for (j = 0; j < FIFO_TX_DEPTH/2 && i < n; j++) {
+ for (j = 0; j < FIFO_TX_DEPTH / 2 && i < n; j++) {
mark = ns_pulse[i] & V4L2_SUBDEV_IR_PULSE_LEVEL_MASK;
fifo_pulse[j] = ns_to_pulse_width_count(
ns_pulse[i] &
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/39bd5835062cd0ce6c4481232b6b415d6138d411
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
