Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / media / common / saa7146_core.c

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 31e53b6..d6b1cf6 100644 (file)
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -18,6 +18,8 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <media/saa7146.h>
 #include <linux/module.h>
 
@@ -36,10 +38,9 @@ static void dump_registers(struct saa7146_dev* dev)
 {
        int i = 0;
 
-       INFO((" @ %li jiffies:\n",jiffies));
-       for(i = 0; i <= 0x148; i+=4) {
-               printk("0x%03x: 0x%08x\n",i,saa7146_read(dev,i));
-       }
+       pr_info(" @ %li jiffies:\n", jiffies);
+       for (i = 0; i <= 0x148; i += 4)
+               pr_info("0x%03x: 0x%08x\n", i, saa7146_read(dev, i));
 }
 #endif
 
@@ -73,9 +74,8 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev,
                if (saa7146_read(dev, MC2) & 2)
                        break;
                if (err) {
-                       printk(KERN_ERR "%s: %s timed out while waiting for "
-                                       "registers getting programmed\n",
-                                       dev->name, __func__);
+                       pr_err("%s: %s timed out while waiting for registers getting programmed\n",
+                              dev->name, __func__);
                        return -ETIMEDOUT;
                }
                msleep(1);
@@ -89,8 +89,8 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev,
                        break;
                saa7146_read(dev, MC2);
                if (err) {
-                       DEB_S(("%s: %s timed out while waiting for transfer "
-                               "completion\n", dev->name, __func__));
+                       DEB_S("%s: %s timed out while waiting for transfer completion\n",
+                             dev->name, __func__);
                        return -ETIMEDOUT;
                }
                msleep(1);
@@ -110,9 +110,8 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev,
                if (saa7146_read(dev, MC2) & 2)
                        break;
                if (!loops--) {
-                       printk(KERN_ERR "%s: %s timed out while waiting for "
-                                       "registers getting programmed\n",
-                                       dev->name, __func__);
+                       pr_err("%s: %s timed out while waiting for registers getting programmed\n",
+                              dev->name, __func__);
                        return -ETIMEDOUT;
                }
                udelay(1);
@@ -125,8 +124,8 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev,
                        break;
                saa7146_read(dev, MC2);
                if (!loops--) {
-                       DEB_S(("%s: %s timed out while waiting for transfer "
-                               "completion\n", dev->name, __func__));
+                       DEB_S("%s: %s timed out while waiting for transfer completion\n",
+                             dev->name, __func__);
                        return -ETIMEDOUT;
                }
                udelay(5);
@@ -265,7 +264,9 @@ int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt
        ptr = pt->cpu;
        for (i = 0; i < sglen; i++, list++) {
 /*
-               printk("i:%d, adr:0x%08x, len:%d, offset:%d\n", i,sg_dma_address(list), sg_dma_len(list), list->offset);
+               pr_debug("i:%d, adr:0x%08x, len:%d, offset:%d\n",
+                        i, sg_dma_address(list), sg_dma_len(list),
+                        list->offset);
 */
                for (p = 0; p * 4096 < list->length; p++, ptr++) {
                        *ptr = cpu_to_le32(sg_dma_address(list) + p * 4096);
@@ -282,9 +283,9 @@ int saa7146_pgtable_build_single(struct pci_dev *pci, struct saa7146_pgtable *pt
 
 /*
        ptr = pt->cpu;
-       printk("offset: %d\n",pt->offset);
+       pr_debug("offset: %d\n", pt->offset);
        for(i=0;i<5;i++) {
-               printk("ptr1 %d: 0x%08x\n",i,ptr[i]);
+               pr_debug("ptr1 %d: 0x%08x\n", i, ptr[i]);
        }
 */
        return 0;
@@ -315,7 +316,7 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id)
                }
        }
        if (0 != (isr & (MASK_27))) {
-               DEB_INT(("irq: RPS0 (0x%08x).\n",isr));
+               DEB_INT("irq: RPS0 (0x%08x)\n", isr);
                if (dev->vv_data && dev->vv_callback)
                        dev->vv_callback(dev,isr);
                isr &= ~MASK_27;
@@ -334,14 +335,15 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id)
                } else {
                        u32 psr = saa7146_read(dev, PSR);
                        u32 ssr = saa7146_read(dev, SSR);
-                       printk(KERN_WARNING "%s: unexpected i2c irq: isr %08x psr %08x ssr %08x\n",
-                              dev->name, isr, psr, ssr);
+                       pr_warn("%s: unexpected i2c irq: isr %08x psr %08x ssr %08x\n",
+                               dev->name, isr, psr, ssr);
                }
                isr &= ~(MASK_16|MASK_17);
        }
        if( 0 != isr ) {
-               ERR(("warning: interrupt enabled, but not handled properly.(0x%08x)\n",isr));
-               ERR(("disabling interrupt source(s)!\n"));
+               ERR("warning: interrupt enabled, but not handled properly.(0x%08x)\n",
+                   isr);
+               ERR("disabling interrupt source(s)!\n");
                SAA7146_IER_DISABLE(dev,isr);
        }
        saa7146_write(dev, ISR, ack_isr);
@@ -361,15 +363,15 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
        /* clear out mem for sure */
        dev = kzalloc(sizeof(struct saa7146_dev), GFP_KERNEL);
        if (!dev) {
-               ERR(("out of memory.\n"));
+               ERR("out of memory\n");
                goto out;
        }
 
-       DEB_EE(("pci:%p\n",pci));
+       DEB_EE("pci:%p\n", pci);
 
        err = pci_enable_device(pci);
        if (err < 0) {
-               ERR(("pci_enable_device() failed.\n"));
+               ERR("pci_enable_device() failed\n");
                goto err_free;
        }
 
@@ -390,7 +392,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
        dev->mem = ioremap(pci_resource_start(pci, 0),
                           pci_resource_len(pci, 0));
        if (!dev->mem) {
-               ERR(("ioremap() failed.\n"));
+               ERR("ioremap() failed\n");
                err = -ENODEV;
                goto err_release;
        }
@@ -415,7 +417,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
        err = request_irq(pci->irq, interrupt_hw, IRQF_SHARED | IRQF_DISABLED,
                          dev->name, dev);
        if (err < 0) {
-               ERR(("request_irq() failed.\n"));
+               ERR("request_irq() failed\n");
                goto err_unmap;
        }
 
@@ -445,7 +447,9 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
        /* create a nice device name */
        sprintf(dev->name, "saa7146 (%d)", saa7146_num);
 
-       INFO(("found saa7146 @ mem %p (revision %d, irq %d) (0x%04x,0x%04x).\n", dev->mem, dev->revision, pci->irq, pci->subsystem_vendor, pci->subsystem_device));
+       pr_info("found saa7146 @ mem %p (revision %d, irq %d) (0x%04x,0x%04x)\n",
+               dev->mem, dev->revision, pci->irq,
+               pci->subsystem_vendor, pci->subsystem_device);
        dev->ext = ext;
 
        mutex_init(&dev->v4l2_lock);
@@ -465,12 +469,12 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
        err = -ENODEV;
 
        if (ext->probe && ext->probe(dev)) {
-               DEB_D(("ext->probe() failed for %p. skipping device.\n",dev));
+               DEB_D("ext->probe() failed for %p. skipping device.\n", dev);
                goto err_free_i2c;
        }
 
        if (ext->attach(dev, pci_ext)) {
-               DEB_D(("ext->attach() failed for %p. skipping device.\n",dev));
+               DEB_D("ext->attach() failed for %p. skipping device.\n", dev);
                goto err_free_i2c;
        }
        /* V4L extensions will set the pci drvdata to the v4l2_device in the
@@ -522,7 +526,7 @@ static void saa7146_remove_one(struct pci_dev *pdev)
                { NULL, 0 }
        }, *p;
 
-       DEB_EE(("dev:%p\n",dev));
+       DEB_EE("dev:%p\n", dev);
 
        dev->ext->detach(dev);
        /* Zero the PCI drvdata after use. */
@@ -553,21 +557,21 @@ static void saa7146_remove_one(struct pci_dev *pdev)
 
 int saa7146_register_extension(struct saa7146_extension* ext)
 {
-       DEB_EE(("ext:%p\n",ext));
+       DEB_EE("ext:%p\n", ext);
 
        ext->driver.name = ext->name;
        ext->driver.id_table = ext->pci_tbl;
        ext->driver.probe = saa7146_init_one;
        ext->driver.remove = saa7146_remove_one;
 
-       printk("saa7146: register extension '%s'.\n",ext->name);
+       pr_info("register extension '%s'\n", ext->name);
        return pci_register_driver(&ext->driver);
 }
 
 int saa7146_unregister_extension(struct saa7146_extension* ext)
 {
-       DEB_EE(("ext:%p\n",ext));
-       printk("saa7146: unregister extension '%s'.\n",ext->name);
+       DEB_EE("ext:%p\n", ext);
+       pr_info("unregister extension '%s'\n", ext->name);
        pci_unregister_driver(&ext->driver);
        return 0;
 }