diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2007-03-20 22:00:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:08:11 -0400 |
commit | 44a6481dcd9ec835bbd608b1b2ee47ee62c7e1d8 (patch) | |
tree | caa2f2a13fa44ff50f207706a61199063440a35a /drivers/media/video/cx23885/cx23885-i2c.c | |
parent | 70ebd70573a58a2c0405ef038f1acf74c795eaa5 (diff) |
V4L/DVB (6162): cx23885: whitespace cleanups
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-i2c.c')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-i2c.c | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/drivers/media/video/cx23885/cx23885-i2c.c b/drivers/media/video/cx23885/cx23885-i2c.c index dbd048d08dda..155ab928cd60 100644 --- a/drivers/media/video/cx23885/cx23885-i2c.c +++ b/drivers/media/video/cx23885/cx23885-i2c.c | |||
@@ -31,11 +31,11 @@ | |||
31 | 31 | ||
32 | static unsigned int i2c_debug = 2; | 32 | static unsigned int i2c_debug = 2; |
33 | module_param(i2c_debug, int, 0644); | 33 | module_param(i2c_debug, int, 0644); |
34 | MODULE_PARM_DESC(i2c_debug,"enable debug messages [i2c]"); | 34 | MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]"); |
35 | 35 | ||
36 | static unsigned int i2c_scan = 0; | 36 | static unsigned int i2c_scan = 0; |
37 | module_param(i2c_scan, int, 0444); | 37 | module_param(i2c_scan, int, 0444); |
38 | MODULE_PARM_DESC(i2c_scan,"scan i2c bus at insmod time"); | 38 | MODULE_PARM_DESC(i2c_scan, "scan i2c bus at insmod time"); |
39 | 39 | ||
40 | #define dprintk(level,fmt, arg...) if (i2c_debug >= level) \ | 40 | #define dprintk(level,fmt, arg...) if (i2c_debug >= level) \ |
41 | printk(KERN_DEBUG "%s: " fmt, dev->name , ## arg) | 41 | printk(KERN_DEBUG "%s: " fmt, dev->name , ## arg) |
@@ -76,7 +76,8 @@ static int i2c_wait_done(struct i2c_adapter *i2c_adap) | |||
76 | return 1; | 76 | return 1; |
77 | } | 77 | } |
78 | 78 | ||
79 | static int i2c_sendbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg, int last) | 79 | static int i2c_sendbytes(struct i2c_adapter *i2c_adap, |
80 | const struct i2c_msg *msg, int last) | ||
80 | { | 81 | { |
81 | struct cx23885_i2c *bus = i2c_adap->algo_data; | 82 | struct cx23885_i2c *bus = i2c_adap->algo_data; |
82 | struct cx23885_dev *dev = bus->dev; | 83 | struct cx23885_dev *dev = bus->dev; |
@@ -150,11 +151,12 @@ static int i2c_sendbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg | |||
150 | eio: | 151 | eio: |
151 | retval = -EIO; | 152 | retval = -EIO; |
152 | err: | 153 | err: |
153 | printk(" ERR: %d\n",retval); | 154 | printk(" ERR: %d\n", retval); |
154 | return retval; | 155 | return retval; |
155 | } | 156 | } |
156 | 157 | ||
157 | static int i2c_readbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg, int last) | 158 | static int i2c_readbytes(struct i2c_adapter *i2c_adap, |
159 | const struct i2c_msg *msg, int last) | ||
158 | { | 160 | { |
159 | struct cx23885_i2c *bus = i2c_adap->algo_data; | 161 | struct cx23885_i2c *bus = i2c_adap->algo_data; |
160 | struct cx23885_dev *dev = bus->dev; | 162 | struct cx23885_dev *dev = bus->dev; |
@@ -206,11 +208,12 @@ static int i2c_readbytes(struct i2c_adapter *i2c_adap, const struct i2c_msg *msg | |||
206 | eio: | 208 | eio: |
207 | retval = -EIO; | 209 | retval = -EIO; |
208 | err: | 210 | err: |
209 | printk(" ERR: %d\n",retval); | 211 | printk(" ERR: %d\n", retval); |
210 | return retval; | 212 | return retval; |
211 | } | 213 | } |
212 | 214 | ||
213 | static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) | 215 | static int i2c_xfer(struct i2c_adapter *i2c_adap, |
216 | struct i2c_msg *msgs, int num) | ||
214 | { | 217 | { |
215 | struct cx23885_i2c *bus = i2c_adap->algo_data; | 218 | struct cx23885_i2c *bus = i2c_adap->algo_data; |
216 | struct cx23885_dev *dev = bus->dev; | 219 | struct cx23885_dev *dev = bus->dev; |
@@ -219,8 +222,8 @@ static int i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) | |||
219 | dprintk(1, "%s(num = %d)\n", __FUNCTION__, num); | 222 | dprintk(1, "%s(num = %d)\n", __FUNCTION__, num); |
220 | 223 | ||
221 | for (i = 0 ; i < num; i++) { | 224 | for (i = 0 ; i < num; i++) { |
222 | dprintk(1, "%s(num = %d) addr = 0x%02x len = 0x%x\n" | 225 | dprintk(1, "%s(num = %d) addr = 0x%02x len = 0x%x\n", |
223 | , __FUNCTION__, num, msgs[i].addr, msgs[i].len); | 226 | __FUNCTION__, num, msgs[i].addr, msgs[i].len); |
224 | if (msgs[i].flags & I2C_M_RD) { | 227 | if (msgs[i].flags & I2C_M_RD) { |
225 | /* read */ | 228 | /* read */ |
226 | retval = i2c_readbytes(i2c_adap, &msgs[i], i+1 == num); | 229 | retval = i2c_readbytes(i2c_adap, &msgs[i], i+1 == num); |
@@ -261,7 +264,8 @@ static int detach_inform(struct i2c_client *client) | |||
261 | return 0; | 264 | return 0; |
262 | } | 265 | } |
263 | 266 | ||
264 | void cx23885_call_i2c_clients(struct cx23885_i2c *bus, unsigned int cmd, void *arg) | 267 | void cx23885_call_i2c_clients(struct cx23885_i2c *bus, |
268 | unsigned int cmd, void *arg) | ||
265 | { | 269 | { |
266 | // struct cx23885_dev *dev = bus->dev; | 270 | // struct cx23885_dev *dev = bus->dev; |
267 | 271 | ||
@@ -316,11 +320,11 @@ static char *i2c_devs[128] = { | |||
316 | static void do_i2c_scan(char *name, struct i2c_client *c) | 320 | static void do_i2c_scan(char *name, struct i2c_client *c) |
317 | { | 321 | { |
318 | unsigned char buf; | 322 | unsigned char buf; |
319 | int i,rc; | 323 | int i, rc; |
320 | 324 | ||
321 | for (i = 0; i < 128; i++) { | 325 | for (i = 0; i < 128; i++) { |
322 | c->addr = i; | 326 | c->addr = i; |
323 | rc = i2c_master_recv(c,&buf,0); | 327 | rc = i2c_master_recv(c, &buf, 0); |
324 | if (rc < 0) | 328 | if (rc < 0) |
325 | continue; | 329 | continue; |
326 | printk("%s: i2c scan: found device @ 0x%x [%s]\n", | 330 | printk("%s: i2c scan: found device @ 0x%x [%s]\n", |
@@ -335,13 +339,17 @@ int cx23885_i2c_register(struct cx23885_i2c *bus) | |||
335 | 339 | ||
336 | dprintk(1, "%s(bus = %d)\n", __FUNCTION__, bus->nr); | 340 | dprintk(1, "%s(bus = %d)\n", __FUNCTION__, bus->nr); |
337 | 341 | ||
338 | memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template, sizeof(bus->i2c_adap)); | 342 | memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template, |
339 | memcpy(&bus->i2c_algo, &cx23885_i2c_algo_template, sizeof(bus->i2c_algo)); | 343 | sizeof(bus->i2c_adap)); |
340 | memcpy(&bus->i2c_client, &cx23885_i2c_client_template, sizeof(bus->i2c_client)); | 344 | memcpy(&bus->i2c_algo, &cx23885_i2c_algo_template, |
345 | sizeof(bus->i2c_algo)); | ||
346 | memcpy(&bus->i2c_client, &cx23885_i2c_client_template, | ||
347 | sizeof(bus->i2c_client)); | ||
341 | 348 | ||
342 | bus->i2c_adap.dev.parent = &dev->pci->dev; | 349 | bus->i2c_adap.dev.parent = &dev->pci->dev; |
343 | 350 | ||
344 | strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name)); | 351 | strlcpy(bus->i2c_adap.name, bus->dev->name, |
352 | sizeof(bus->i2c_adap.name)); | ||
345 | bus->i2c_algo.data = bus; | 353 | bus->i2c_algo.data = bus; |
346 | bus->i2c_adap.algo_data = bus; | 354 | bus->i2c_adap.algo_data = bus; |
347 | i2c_add_adapter(&bus->i2c_adap); | 355 | i2c_add_adapter(&bus->i2c_adap); |