aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx231xx/cx231xx-i2c.c
diff options
context:
space:
mode:
authorSri Deevi <srinivasa.deevi@conexant.com>2009-03-10 20:16:26 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:44:04 -0400
commit6e4f574ba43511ac1cb860027275e08529c5a28f (patch)
tree6e710a1f93e12c001b2d8634d1a344690586a6ac /drivers/media/video/cx231xx/cx231xx-i2c.c
parentb9255176453086b2531c5559350bd5c92b771cc5 (diff)
V4L/DVB (10958): cx231xx: some additional CodingStyle and minor fixes
changed the pcb-config.c/h to pcb-cfg.c/h for short names. Signed-off-by: Srinivasa Deevi <srinivasa.deevi@conexant.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx/cx231xx-i2c.c')
-rw-r--r--drivers/media/video/cx231xx/cx231xx-i2c.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-i2c.c b/drivers/media/video/cx231xx/cx231xx-i2c.c
index 1af87579ab49..4489126c48c1 100644
--- a/drivers/media/video/cx231xx/cx231xx-i2c.c
+++ b/drivers/media/video/cx231xx/cx231xx-i2c.c
@@ -42,8 +42,8 @@ MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
42#define dprintk1(lvl, fmt, args...) \ 42#define dprintk1(lvl, fmt, args...) \
43do { \ 43do { \
44 if (i2c_debug >= lvl) { \ 44 if (i2c_debug >= lvl) { \
45 printk(fmt, ##args); \ 45 printk(fmt, ##args); \
46 } \ 46 } \
47} while (0) 47} while (0)
48 48
49#define dprintk2(lvl, fmt, args...) \ 49#define dprintk2(lvl, fmt, args...) \
@@ -77,13 +77,10 @@ int cx231xx_i2c_send_bytes(struct i2c_adapter *i2c_adap,
77 size = msg->len; 77 size = msg->len;
78 78
79 if (size == 2) { /* register write sub addr */ 79 if (size == 2) { /* register write sub addr */
80 80 /* Just writing sub address will cause problem
81 /* Just writing sub address will cause problem to XC5000 81 * to XC5000. So ignore the request */
82 So ignore the request */
83 return 0; 82 return 0;
84
85 } else if (size == 4) { /* register write with sub addr */ 83 } else if (size == 4) { /* register write with sub addr */
86
87 if (msg->len >= 2) 84 if (msg->len >= 2)
88 saddr = msg->buf[0] << 8 | msg->buf[1]; 85 saddr = msg->buf[0] << 8 | msg->buf[1];
89 else if (msg->len == 1) 86 else if (msg->len == 1)
@@ -117,7 +114,6 @@ int cx231xx_i2c_send_bytes(struct i2c_adapter *i2c_adap,
117 msg->buf, 114 msg->buf,
118 msg->len); 115 msg->len);
119 } 116 }
120
121 } 117 }
122 118
123 /* special case for Xc5000 tuner case */ 119 /* special case for Xc5000 tuner case */