aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tda9887.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:37:43 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:20 -0500
commit4ac97914c6c35f6bf132071c718e034d0846b9f5 (patch)
tree98c7eb827bb8ba99730ed89d32703a30448fd813 /drivers/media/video/tda9887.c
parenta8900fc242406f25f315190a6d650f1d54617c2f (diff)
[PATCH] v4l: 800: whitespace cleanups
- Whitespace Cleanups. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/tda9887.c')
-rw-r--r--drivers/media/video/tda9887.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 6d2914f738f2..9d6b6f57abcd 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -46,11 +46,11 @@ MODULE_LICENSE("GPL");
46#define UNSET (-1U) 46#define UNSET (-1U)
47#define tda9887_info(fmt, arg...) do {\ 47#define tda9887_info(fmt, arg...) do {\
48 printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \ 48 printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \
49 i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0) 49 i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0)
50#define tda9887_dbg(fmt, arg...) do {\ 50#define tda9887_dbg(fmt, arg...) do {\
51 if (debug) \ 51 if (debug) \
52 printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \ 52 printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \
53 i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0) 53 i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0)
54 54
55struct tda9887 { 55struct tda9887 {
56 struct i2c_client client; 56 struct i2c_client client;
@@ -484,11 +484,11 @@ static int tda9887_set_pinnacle(struct tda9887 *t, char *buf)
484 } 484 }
485 } 485 }
486 if (t->std & V4L2_STD_525_60) { 486 if (t->std & V4L2_STD_525_60) {
487 if ((5 == t->pinnacle_id) || (6 == t->pinnacle_id)) { 487 if ((5 == t->pinnacle_id) || (6 == t->pinnacle_id)) {
488 bCarrierMode = cIntercarrier; 488 bCarrierMode = cIntercarrier;
489 } else { 489 } else {
490 bCarrierMode = cQSS; 490 bCarrierMode = cQSS;
491 } 491 }
492 } 492 }
493 493
494 if (bCarrierMode != UNSET) { 494 if (bCarrierMode != UNSET) {
@@ -568,8 +568,8 @@ static int tda9887_status(struct tda9887 *t)
568 int rc; 568 int rc;
569 569
570 memset(buf,0,sizeof(buf)); 570 memset(buf,0,sizeof(buf));
571 if (1 != (rc = i2c_master_recv(&t->client,buf,1))) 571 if (1 != (rc = i2c_master_recv(&t->client,buf,1)))
572 tda9887_info("i2c i/o error: rc == %d (should be 1)\n",rc); 572 tda9887_info("i2c i/o error: rc == %d (should be 1)\n",rc);
573 dump_read_message(t, buf); 573 dump_read_message(t, buf);
574 return 0; 574 return 0;
575} 575}
@@ -600,8 +600,8 @@ static int tda9887_configure(struct tda9887 *t)
600 if (debug > 1) 600 if (debug > 1)
601 dump_write_message(t, t->data); 601 dump_write_message(t, t->data);
602 602
603 if (4 != (rc = i2c_master_send(&t->client,t->data,4))) 603 if (4 != (rc = i2c_master_send(&t->client,t->data,4)))
604 tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc); 604 tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc);
605 605
606 if (debug > 2) { 606 if (debug > 2) {
607 msleep_interruptible(1000); 607 msleep_interruptible(1000);
@@ -616,11 +616,11 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
616{ 616{
617 struct tda9887 *t; 617 struct tda9887 *t;
618 618
619 client_template.adapter = adap; 619 client_template.adapter = adap;
620 client_template.addr = addr; 620 client_template.addr = addr;
621 621
622 if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL))) 622 if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
623 return -ENOMEM; 623 return -ENOMEM;
624 memset(t,0,sizeof(*t)); 624 memset(t,0,sizeof(*t));
625 625
626 t->client = client_template; 626 t->client = client_template;
@@ -628,7 +628,7 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
628 t->pinnacle_id = UNSET; 628 t->pinnacle_id = UNSET;
629 t->radio_mode = V4L2_TUNER_MODE_STEREO; 629 t->radio_mode = V4L2_TUNER_MODE_STEREO;
630 630
631 tda9887_info("chip found @ 0x%x (%s)\n", addr<<1, adap->name); 631 tda9887_info("chip found @ 0x%x (%s)\n", addr<<1, adap->name);
632 632
633 i2c_set_clientdata(&t->client, t); 633 i2c_set_clientdata(&t->client, t);
634 i2c_attach_client(&t->client); 634 i2c_attach_client(&t->client);
@@ -663,18 +663,18 @@ static int tda9887_detach(struct i2c_client *client)
663} 663}
664 664
665#define SWITCH_V4L2 if (!t->using_v4l2 && debug) \ 665#define SWITCH_V4L2 if (!t->using_v4l2 && debug) \
666 tda9887_info("switching to v4l2\n"); \ 666 tda9887_info("switching to v4l2\n"); \
667 t->using_v4l2 = 1; 667 t->using_v4l2 = 1;
668#define CHECK_V4L2 if (t->using_v4l2) { if (debug) \ 668#define CHECK_V4L2 if (t->using_v4l2) { if (debug) \
669 tda9887_info("ignore v4l1 call\n"); \ 669 tda9887_info("ignore v4l1 call\n"); \
670 return 0; } 670 return 0; }
671 671
672static int 672static int
673tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg) 673tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
674{ 674{
675 struct tda9887 *t = i2c_get_clientdata(client); 675 struct tda9887 *t = i2c_get_clientdata(client);
676 676
677 switch (cmd) { 677 switch (cmd) {
678 678
679 /* --- configuration --- */ 679 /* --- configuration --- */
680 case AUDC_SET_RADIO: 680 case AUDC_SET_RADIO: