[media] V4L: mt9t112: support the new mbus-config subdev ops
[pandora-kernel.git] / drivers / media / common / saa7146_i2c.c
index b2ba9dc..2202719 100644 (file)
@@ -1,8 +1,10 @@
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <media/saa7146_vv.h>
 
 static u32 saa7146_i2c_func(struct i2c_adapter *adapter)
 {
-//fm   DEB_I2C(("'%s'.\n", adapter->name));
+       /* DEB_I2C("'%s'\n", adapter->name); */
 
        return    I2C_FUNC_I2C
                | I2C_FUNC_SMBUS_QUICK
@@ -14,9 +16,7 @@ static u32 saa7146_i2c_func(struct i2c_adapter *adapter)
 static inline u32 saa7146_i2c_status(struct saa7146_dev *dev)
 {
        u32 iicsta = saa7146_read(dev, I2C_STATUS);
-/*
-       DEB_I2C(("status: 0x%08x\n",iicsta));
-*/
+       /* DEB_I2C("status: 0x%08x\n", iicsta); */
        return iicsta;
 }
 
@@ -39,10 +39,11 @@ static int saa7146_i2c_msg_prepare(const struct i2c_msg *m, int num, __le32 *op)
           plus one extra byte to address the device */
        mem = 1 + ((mem-1) / 3);
 
-       /* we assume that op points to a memory of at least SAA7146_I2C_MEM bytes
-          size. if we exceed this limit... */
-       if ( (4*mem) > SAA7146_I2C_MEM ) {
-//fm           DEB_I2C(("cannot prepare i2c-message.\n"));
+       /* we assume that op points to a memory of at least
+        * SAA7146_I2C_MEM bytes size. if we exceed this limit...
+        */
+       if ((4 * mem) > SAA7146_I2C_MEM) {
+               /* DEB_I2C("cannot prepare i2c-message\n"); */
                return -ENOMEM;
        }
 
@@ -123,7 +124,7 @@ static int saa7146_i2c_reset(struct saa7146_dev *dev)
        if ( 0 != ( status & SAA7146_I2C_BUSY) ) {
 
                /* yes, kill ongoing operation */
-               DEB_I2C(("busy_state detected.\n"));
+               DEB_I2C("busy_state detected\n");
 
                /* set "ABORT-OPERATION"-bit (bit 7)*/
                saa7146_write(dev, I2C_STATUS, (dev->i2c_bitrate | MASK_07));
@@ -141,7 +142,7 @@ static int saa7146_i2c_reset(struct saa7146_dev *dev)
 
        if ( dev->i2c_bitrate != status ) {
 
-               DEB_I2C(("error_state detected. status:0x%08x\n",status));
+               DEB_I2C("error_state detected. status:0x%08x\n", status);
 
                /* Repeat the abort operation. This seems to be necessary
                   after serious protocol errors caused by e.g. the SAA7740 */
@@ -164,7 +165,7 @@ static int saa7146_i2c_reset(struct saa7146_dev *dev)
        /* if any error is still present, a fatal error has occurred ... */
        status = saa7146_i2c_status(dev);
        if ( dev->i2c_bitrate != status ) {
-               DEB_I2C(("fatal error. status:0x%08x\n",status));
+               DEB_I2C("fatal error. status:0x%08x\n", status);
                return -1;
        }
 
@@ -181,7 +182,8 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor
        unsigned long timeout;
 
        /* write out i2c-command */
-       DEB_I2C(("before: 0x%08x (status: 0x%08x), %d\n",*dword,saa7146_read(dev, I2C_STATUS), dev->i2c_op));
+       DEB_I2C("before: 0x%08x (status: 0x%08x), %d\n",
+               *dword, saa7146_read(dev, I2C_STATUS), dev->i2c_op);
 
        if( 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags)) {
 
@@ -202,7 +204,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor
                                /* a signal arrived */
                                return -ERESTARTSYS;
 
-                       printk(KERN_WARNING "%s %s [irq]: timed out waiting for end of xfer\n",
+                       pr_warn("%s %s [irq]: timed out waiting for end of xfer\n",
                                dev->name, __func__);
                        return -EIO;
                }
@@ -220,7 +222,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor
                                break;
                        }
                        if (time_after(jiffies,timeout)) {
-                               printk(KERN_WARNING "%s %s: timed out waiting for MC2\n",
+                               pr_warn("%s %s: timed out waiting for MC2\n",
                                        dev->name, __func__);
                                return -EIO;
                        }
@@ -237,7 +239,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor
                                /* this is normal when probing the bus
                                 * (no answer from nonexisistant device...)
                                 */
-                               printk(KERN_WARNING "%s %s [poll]: timed out waiting for end of xfer\n",
+                               pr_warn("%s %s [poll]: timed out waiting for end of xfer\n",
                                        dev->name, __func__);
                                return -EIO;
                        }
@@ -257,24 +259,24 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor
                if ( 0 == (status & SAA7146_I2C_ERR) ||
                     0 == (status & SAA7146_I2C_BUSY) ) {
                        /* it may take some time until ERR goes high - ignore */
-                       DEB_I2C(("unexpected i2c status %04x\n", status));
+                       DEB_I2C("unexpected i2c status %04x\n", status);
                }
                if( 0 != (status & SAA7146_I2C_SPERR) ) {
-                       DEB_I2C(("error due to invalid start/stop condition.\n"));
+                       DEB_I2C("error due to invalid start/stop condition\n");
                }
                if( 0 != (status & SAA7146_I2C_DTERR) ) {
-                       DEB_I2C(("error in data transmission.\n"));
+                       DEB_I2C("error in data transmission\n");
                }
                if( 0 != (status & SAA7146_I2C_DRERR) ) {
-                       DEB_I2C(("error when receiving data.\n"));
+                       DEB_I2C("error when receiving data\n");
                }
                if( 0 != (status & SAA7146_I2C_AL) ) {
-                       DEB_I2C(("error because arbitration lost.\n"));
+                       DEB_I2C("error because arbitration lost\n");
                }
 
                /* we handle address-errors here */
                if( 0 != (status & SAA7146_I2C_APERR) ) {
-                       DEB_I2C(("error in address phase.\n"));
+                       DEB_I2C("error in address phase\n");
                        return -EREMOTEIO;
                }
 
@@ -284,7 +286,7 @@ static int saa7146_i2c_writeout(struct saa7146_dev *dev, __le32 *dword, int shor
        /* read back data, just in case we were reading ... */
        *dword = cpu_to_le32(saa7146_read(dev, I2C_TRANSFER));
 
-       DEB_I2C(("after: 0x%08x\n",*dword));
+       DEB_I2C("after: 0x%08x\n", *dword);
        return 0;
 }
 
@@ -299,7 +301,7 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m
                return -ERESTARTSYS;
 
        for(i=0;i<num;i++) {
-               DEB_I2C(("msg:%d/%d\n",i+1,num));
+               DEB_I2C("msg:%d/%d\n", i+1, num);
        }
 
        /* prepare the message(s), get number of u32s to transfer */
@@ -316,7 +318,7 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m
                /* reset the i2c-device if necessary */
                err = saa7146_i2c_reset(dev);
                if ( 0 > err ) {
-                       DEB_I2C(("could not reset i2c-device.\n"));
+                       DEB_I2C("could not reset i2c-device\n");
                        goto out;
                }
 
@@ -336,7 +338,7 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m
                                   address error and trust the saa7146 address error detection. */
                                if (-EREMOTEIO == err && 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags))
                                        goto out;
-                               DEB_I2C(("error while sending message(s). starting again.\n"));
+                               DEB_I2C("error while sending message(s). starting again\n");
                                break;
                        }
                }
@@ -356,13 +358,13 @@ static int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *m
 
        /* if any things had to be read, get the results */
        if ( 0 != saa7146_i2c_msg_cleanup(msgs, num, buffer)) {
-               DEB_I2C(("could not cleanup i2c-message.\n"));
+               DEB_I2C("could not cleanup i2c-message\n");
                err = -1;
                goto out;
        }
 
        /* return the number of delivered messages */
-       DEB_I2C(("transmission successful. (msg:%d).\n",err));
+       DEB_I2C("transmission successful. (msg:%d)\n", err);
 out:
        /* another bug in revision 0: the i2c-registers get uploaded randomly by other
           uploads, so we better clear them out before continuing */
@@ -370,7 +372,7 @@ out:
                __le32 zero = 0;
                saa7146_i2c_reset(dev);
                if( 0 != saa7146_i2c_writeout(dev, &zero, short_delay)) {
-                       INFO(("revision 0 error. this should never happen.\n"));
+                       pr_info("revision 0 error. this should never happen\n");
                }
        }
 
@@ -400,7 +402,7 @@ static struct i2c_algorithm saa7146_algo = {
 
 int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate)
 {
-       DEB_EE(("bitrate: 0x%08x\n",bitrate));
+       DEB_EE("bitrate: 0x%08x\n", bitrate);
 
        /* enable i2c-port pins */
        saa7146_write(dev, MC1, (MASK_08 | MASK_24));