Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

[sfrench/cifs-2.6.git] / drivers / media / pci / ivtv / ivtv-driver.c

diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index ee48c3e09de41d5987612afe7efb2962804195d1..0a3b80a4bd69d69e0b967156d42d3148a2e22729 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -885,8 +885,8 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev,
        pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &pci_latency);
 
        if (pci_latency < 64 && ivtv_pci_latency) {
-               IVTV_INFO("Unreasonably low latency timer, "
-                              "setting to 64 (was %d)\n", pci_latency);
+               IVTV_INFO("Unreasonably low latency timer, setting to 64 (was %d)\n",
+                         pci_latency);
                pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 64);
                pci_read_config_byte(pdev, PCI_LATENCY_TIMER, &pci_latency);
        }
@@ -896,8 +896,7 @@ static int ivtv_setup_pci(struct ivtv *itv, struct pci_dev *pdev,
           these problems. */
        pci_write_config_dword(pdev, 0x40, 0xffff);
 
-       IVTV_DEBUG_INFO("%d (rev %d) at %02x:%02x.%x, "
-                  "irq: %d, latency: %d, memory: 0x%llx\n",
+       IVTV_DEBUG_INFO("%d (rev %d) at %02x:%02x.%x, irq: %d, latency: %d, memory: 0x%llx\n",
                   pdev->device, pdev->revision, pdev->bus->number,
                   PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn),
                   pdev->irq, pci_latency, (u64)itv->base_addr);
@@ -1047,13 +1046,10 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
        itv->enc_mem = ioremap_nocache(itv->base_addr + IVTV_ENCODER_OFFSET,
                                       IVTV_ENCODER_SIZE);
        if (!itv->enc_mem) {
-               IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 "
-                        "encoder memory\n");
-               IVTV_ERR("Each capture card with a CX23415/6 needs 8 MB of "
-                        "vmalloc address space for this window\n");
+               IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 encoder memory\n");
+               IVTV_ERR("Each capture card with a CX23415/6 needs 8 MB of vmalloc address space for this window\n");
                IVTV_ERR("Check the output of 'grep Vmalloc /proc/meminfo'\n");
-               IVTV_ERR("Use the vmalloc= kernel command line option to set "
-                        "VmallocTotal to a larger value\n");
+               IVTV_ERR("Use the vmalloc= kernel command line option to set VmallocTotal to a larger value\n");
                retval = -ENOMEM;
                goto free_mem;
        }
@@ -1064,14 +1060,10 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
                itv->dec_mem = ioremap_nocache(itv->base_addr + IVTV_DECODER_OFFSET,
                                IVTV_DECODER_SIZE);
                if (!itv->dec_mem) {
-                       IVTV_ERR("ioremap failed. Can't get a window into "
-                                "CX23415 decoder memory\n");
-                       IVTV_ERR("Each capture card with a CX23415 needs 8 MB "
-                                "of vmalloc address space for this window\n");
-                       IVTV_ERR("Check the output of 'grep Vmalloc "
-                                "/proc/meminfo'\n");
-                       IVTV_ERR("Use the vmalloc= kernel command line option "
-                                "to set VmallocTotal to a larger value\n");
+                       IVTV_ERR("ioremap failed. Can't get a window into CX23415 decoder memory\n");
+                       IVTV_ERR("Each capture card with a CX23415 needs 8 MB of vmalloc address space for this window\n");
+                       IVTV_ERR("Check the output of 'grep Vmalloc /proc/meminfo'\n");
+                       IVTV_ERR("Use the vmalloc= kernel command line option to set VmallocTotal to a larger value\n");
                        retval = -ENOMEM;
                        goto free_mem;
                }
@@ -1086,13 +1078,10 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
        itv->reg_mem =
            ioremap_nocache(itv->base_addr + IVTV_REG_OFFSET, IVTV_REG_SIZE);
        if (!itv->reg_mem) {
-               IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 "
-                        "register space\n");
-               IVTV_ERR("Each capture card with a CX23415/6 needs 64 kB of "
-                        "vmalloc address space for this window\n");
+               IVTV_ERR("ioremap failed. Can't get a window into CX23415/6 register space\n");
+               IVTV_ERR("Each capture card with a CX23415/6 needs 64 kB of vmalloc address space for this window\n");
                IVTV_ERR("Check the output of 'grep Vmalloc /proc/meminfo'\n");
-               IVTV_ERR("Use the vmalloc= kernel command line option to set "
-                        "VmallocTotal to a larger value\n");
+               IVTV_ERR("Use the vmalloc= kernel command line option to set VmallocTotal to a larger value\n");
                retval = -ENOMEM;
                goto free_io;
        }