Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6] / drivers / media / common / saa7146_core.c

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 7d04a6fd1acb03affddb06faada0a40018066a19..89c7660b85d66cf4dc84c6da4baa9ba14461bd0e 100644 (file)
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -74,7 +74,7 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev,
                if (err) {
                        printk(KERN_ERR "%s: %s timed out while waiting for "
                                        "registers getting programmed\n",
-                                       dev->name, __FUNCTION__);
+                                       dev->name, __func__);
                        return -ETIMEDOUT;
                }
                msleep(1);
@@ -89,7 +89,7 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev,
                saa7146_read(dev, MC2);
                if (err) {
                        DEB_S(("%s: %s timed out while waiting for transfer "
-                               "completion\n", dev->name, __FUNCTION__));
+                               "completion\n", dev->name, __func__));
                        return -ETIMEDOUT;
                }
                msleep(1);
@@ -111,7 +111,7 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev,
                if (!loops--) {
                        printk(KERN_ERR "%s: %s timed out while waiting for "
                                        "registers getting programmed\n",
-                                       dev->name, __FUNCTION__);
+                                       dev->name, __func__);
                        return -ETIMEDOUT;
                }
                udelay(1);
@@ -125,7 +125,7 @@ static inline int saa7146_wait_for_debi_done_busyloop(struct saa7146_dev *dev,
                saa7146_read(dev, MC2);
                if (!loops--) {
                        DEB_S(("%s: %s timed out while waiting for transfer "
-                               "completion\n", dev->name, __FUNCTION__));
+                               "completion\n", dev->name, __func__));
                        return -ETIMEDOUT;
                }
                udelay(5);
@@ -306,25 +306,22 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id)
                return IRQ_NONE;
        }
 
-       if( 0 != (dev->ext)) {
-               if( 0 != (dev->ext->irq_mask & isr )) {
-                       if( 0 != dev->ext->irq_func ) {
+       if (dev->ext) {
+               if (dev->ext->irq_mask & isr) {
+                       if (dev->ext->irq_func)
                                dev->ext->irq_func(dev, &isr);
-                       }
                        isr &= ~dev->ext->irq_mask;
                }
        }
        if (0 != (isr & (MASK_27))) {
                DEB_INT(("irq: RPS0 (0x%08x).\n",isr));
-               if( 0 != dev->vv_data && 0 != dev->vv_callback) {
+               if (dev->vv_data && dev->vv_callback)
                        dev->vv_callback(dev,isr);
-               }
                isr &= ~MASK_27;
        }
        if (0 != (isr & (MASK_28))) {
-               if( 0 != dev->vv_data && 0 != dev->vv_callback) {
+               if (dev->vv_data && dev->vv_callback)
                        dev->vv_callback(dev,isr);
-               }
                isr &= ~MASK_28;
        }
        if (0 != (isr & (MASK_16|MASK_17))) {
@@ -388,7 +385,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
        }
        dev->revision &= 0xf;
 
-       /* remap the memory from virtual to physical adress */
+       /* remap the memory from virtual to physical address */
 
        err = pci_request_region(pci, 0, "saa7146");
        if (err < 0)