[PATCH] v4l: 800: whitespace cleanups

[deliverable/linux.git] / drivers / media / video / tda9887.c

diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 796110d4ff72256aad4f9c745d990ff2d6c0ce13..9d6b6f57abcde21e6e1bf34c53cabe065b7b49ea 100644 (file)
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -46,11 +46,11 @@ MODULE_LICENSE("GPL");
 #define UNSET       (-1U)
 #define tda9887_info(fmt, arg...) do {\
        printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \
-                        i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0)
+                       i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0)
 #define tda9887_dbg(fmt, arg...) do {\
        if (debug) \
-                printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \
-                        i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0)
+               printk(KERN_INFO "%s %d-%04x: " fmt, t->client.name, \
+                       i2c_adapter_id(t->client.adapter), t->client.addr , ##arg); } while (0)
 
 struct tda9887 {
        struct i2c_client  client;
@@ -60,6 +60,7 @@ struct tda9887 {
        unsigned int       pinnacle_id;
        unsigned int       using_v4l2;
        unsigned int       radio_mode;
+       unsigned char      data[4];
 };
 
 struct tvnorm {
@@ -483,11 +484,11 @@ static int tda9887_set_pinnacle(struct tda9887 *t, char *buf)
                }
        }
        if (t->std & V4L2_STD_525_60) {
-                if ((5 == t->pinnacle_id) || (6 == t->pinnacle_id)) {
+               if ((5 == t->pinnacle_id) || (6 == t->pinnacle_id)) {
                        bCarrierMode = cIntercarrier;
                } else {
                        bCarrierMode = cQSS;
-                }
+               }
        }
 
        if (bCarrierMode != UNSET) {
@@ -567,41 +568,40 @@ static int tda9887_status(struct tda9887 *t)
        int rc;
 
        memset(buf,0,sizeof(buf));
-        if (1 != (rc = i2c_master_recv(&t->client,buf,1)))
-                tda9887_info("i2c i/o error: rc == %d (should be 1)\n",rc);
+       if (1 != (rc = i2c_master_recv(&t->client,buf,1)))
+               tda9887_info("i2c i/o error: rc == %d (should be 1)\n",rc);
        dump_read_message(t, buf);
        return 0;
 }
 
 static int tda9887_configure(struct tda9887 *t)
 {
-       unsigned char buf[4];
        int rc;
 
-       memset(buf,0,sizeof(buf));
-       tda9887_set_tvnorm(t,buf);
+       memset(t->data,0,sizeof(t->data));
+       tda9887_set_tvnorm(t,t->data);
 
-       buf[1] |= cOutputPort1Inactive;
-       buf[1] |= cOutputPort2Inactive;
+       t->data[1] |= cOutputPort1Inactive;
+       t->data[1] |= cOutputPort2Inactive;
 
        if (UNSET != t->pinnacle_id) {
-               tda9887_set_pinnacle(t,buf);
+               tda9887_set_pinnacle(t,t->data);
        }
-       tda9887_set_config(t,buf);
-       tda9887_set_insmod(t,buf);
+       tda9887_set_config(t,t->data);
+       tda9887_set_insmod(t,t->data);
 
        if (t->mode == T_STANDBY) {
-               buf[1] |= cForcedMuteAudioON;
+               t->data[1] |= cForcedMuteAudioON;
        }
 
 
        tda9887_dbg("writing: b=0x%02x c=0x%02x e=0x%02x\n",
-               buf[1],buf[2],buf[3]);
+               t->data[1],t->data[2],t->data[3]);
        if (debug > 1)
-               dump_write_message(t, buf);
+               dump_write_message(t, t->data);
 
-        if (4 != (rc = i2c_master_send(&t->client,buf,4)))
-                tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc);
+       if (4 != (rc = i2c_master_send(&t->client,t->data,4)))
+               tda9887_info("i2c i/o error: rc == %d (should be 4)\n",rc);
 
        if (debug > 2) {
                msleep_interruptible(1000);
@@ -616,11 +616,11 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
 {
        struct tda9887 *t;
 
-        client_template.adapter = adap;
-        client_template.addr    = addr;
+       client_template.adapter = adap;
+       client_template.addr    = addr;
 
-        if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
-                return -ENOMEM;
+       if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
+               return -ENOMEM;
        memset(t,0,sizeof(*t));
 
        t->client      = client_template;
@@ -628,7 +628,7 @@ static int tda9887_attach(struct i2c_adapter *adap, int addr, int kind)
        t->pinnacle_id = UNSET;
        t->radio_mode = V4L2_TUNER_MODE_STEREO;
 
-        tda9887_info("chip found @ 0x%x (%s)\n", addr<<1, adap->name);
+       tda9887_info("chip found @ 0x%x (%s)\n", addr<<1, adap->name);
 
        i2c_set_clientdata(&t->client, t);
        i2c_attach_client(&t->client);
@@ -663,18 +663,18 @@ static int tda9887_detach(struct i2c_client *client)
 }
 
 #define SWITCH_V4L2    if (!t->using_v4l2 && debug) \
-                         tda9887_info("switching to v4l2\n"); \
-                         t->using_v4l2 = 1;
+                         tda9887_info("switching to v4l2\n"); \
+                         t->using_v4l2 = 1;
 #define CHECK_V4L2     if (t->using_v4l2) { if (debug) \
                          tda9887_info("ignore v4l1 call\n"); \
-                         return 0; }
+                         return 0; }
 
 static int
 tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
 {
        struct tda9887 *t = i2c_get_clientdata(client);
 
-        switch (cmd) {
+       switch (cmd) {
 
        /* --- configuration --- */
        case AUDC_SET_RADIO:
@@ -785,6 +785,11 @@ tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
                }
                break;
        }
+       case VIDIOC_LOG_STATUS:
+       {
+               tda9887_info("Data bytes: b=%02x c=%02x e=%02x\n", t->data[1], t->data[2], t->data[3]);
+               break;
+       }
        default:
                /* nothing */
                break;