[media] saa7164: don't break long lines

Due to the 80-cols restrictions, and latter due to checkpatch
warnings, several strings were broken into multiple lines. This
is not considered a good practice anymore, as it makes harder
to grep for strings at the source code.

As we're right now fixing other drivers due to KERN_CONT, we need
to be able to identify what printk strings don't end with a "\n".
It is a way easier to detect those if we don't break long lines.

So, join those continuation lines.

The patch was generated via the script below, and manually
adjusted if needed.

</script>
use Text::Tabs;
while (<>) {
	if ($next ne "") {
		$c=$_;
		if ($c =~ /^\s+\"(.*)/) {
			$c2=$1;
			$next =~ s/\"\n$//;
			$n = expand($next);
			$funpos = index($n, '(');
			$pos = index($c2, '",');
			if ($funpos && $pos > 0) {
				$s1 = substr $c2, 0, $pos + 2;
				$s2 = ' ' x ($funpos + 1) . substr $c2, $pos + 2;
				$s2 =~ s/^\s+//;

				$s2 = ' ' x ($funpos + 1) . $s2 if ($s2 ne "");

				print unexpand("$next$s1\n");
				print unexpand("$s2\n") if ($s2 ne "");
			} else {
				print "$next$c2\n";
			}
			$next="";
			next;
		} else {
			print $next;
		}
		$next="";
	} else {
		if (m/\"$/) {
			if (!m/\\n\"$/) {
				$next=$_;
				next;
			}
		}
	}
	print $_;
}
</script>

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/pci/saa7164/saa7164-buffer.c b/drivers/media/pci/saa7164/saa7164-buffer.c
index f30758e24f5d93d7f15d5aea3ca8d58cf74762b4..62c34504199df6f8021bd5f1594688e560a140df 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-buffer.c
+++ b/drivers/media/pci/saa7164/saa7164-buffer.c
@@ -218,8 +218,7 @@ int saa7164_buffer_activate(struct saa7164_buffer *buf, int i)
        saa7164_writel(port->bufptr32h + ((sizeof(u32) * 2) * i), buf->pt_dma);
        saa7164_writel(port->bufptr32l + ((sizeof(u32) * 2) * i), 0);
 
-       dprintk(DBGLVL_BUF, "   buf[%d] offset 0x%llx (0x%x) "
-               "buf 0x%llx/%llx (0x%x/%x) nr=%d\n",
+       dprintk(DBGLVL_BUF, "   buf[%d] offset 0x%llx (0x%x) buf 0x%llx/%llx (0x%x/%x) nr=%d\n",
                buf->idx,
                (u64)port->bufoffset + (i * sizeof(u32)),
                saa7164_readl(port->bufoffset + (sizeof(u32) * i)),

diff --git a/drivers/media/pci/saa7164/saa7164-bus.c b/drivers/media/pci/saa7164/saa7164-bus.c
index a18fe5d47238749db79c54fbb6beac43858965b3..e305c02f9dc9d9a06a54e6bd2ef08664b96c61c5 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-bus.c
+++ b/drivers/media/pci/saa7164/saa7164-bus.c
@@ -427,8 +427,8 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
                write_distance = curr_gwp + bus->m_dwSizeGetRing - curr_grp;
 
        if (bytes_to_read > write_distance) {
-               printk(KERN_ERR "%s() Invalid bus state, missing msg "
-                       "or mangled ring, faulty H/W / bad code?\n", __func__);
+               printk(KERN_ERR "%s() Invalid bus state, missing msg or mangled ring, faulty H/W / bad code?\n",
+                      __func__);
                ret = SAA_ERR_INVALID_COMMAND;
                goto out;
        }

diff --git a/drivers/media/pci/saa7164/saa7164-cards.c b/drivers/media/pci/saa7164/saa7164-cards.c
index c2b738227f5837044a6d9207c47a4c4e5393aeb7..15a98c638c5563d48bdb75c6115c42081d507984 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-cards.c
+++ b/drivers/media/pci/saa7164/saa7164-cards.c
@@ -726,8 +726,8 @@ void saa7164_card_list(struct saa7164_dev *dev)
                        dev->name, dev->name, dev->name, dev->name);
        }
 
-       printk(KERN_ERR "%s: Here are valid choices for the card=<n> insmod "
-               "option:\n", dev->name);
+       printk(KERN_ERR "%s: Here are valid choices for the card=<n> insmod option:\n",
+              dev->name);
 
        for (i = 0; i < saa7164_bcount; i++)
                printk(KERN_ERR "%s:    card=%d -> %s\n",

diff --git a/drivers/media/pci/saa7164/saa7164-cmd.c b/drivers/media/pci/saa7164/saa7164-cmd.c
index 3285c37b4583de4948a75567bd36d25faff94a19..45951b3cc251c6ab21f670bd5d8d902f1f60fabf 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-cmd.c
+++ b/drivers/media/pci/saa7164/saa7164-cmd.c
@@ -301,8 +301,8 @@ static int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno)
                        else
                                saa7164_cmd_timeout_seqno(dev, seqno);
 
-                       dprintk(DBGLVL_CMD, "%s(seqno=%d) Waiting res = %d "
-                               "(signalled=%d)\n", __func__, seqno, r,
+                       dprintk(DBGLVL_CMD, "%s(seqno=%d) Waiting res = %d (signalled=%d)\n",
+                               __func__, seqno, r,
                                dev->cmds[seqno].signalled);
                } else
                        ret = SAA_OK;
@@ -353,8 +353,8 @@ int saa7164_cmd_send(struct saa7164_dev *dev, u8 id, enum tmComResCmd command,
        int ret;
        int safety = 0;
 
-       dprintk(DBGLVL_CMD, "%s(unitid = %s (%d) , command = 0x%x, "
-               "sel = 0x%x)\n", __func__, saa7164_unitid_name(dev, id), id,
+       dprintk(DBGLVL_CMD, "%s(unitid = %s (%d) , command = 0x%x, sel = 0x%x)\n",
+               __func__, saa7164_unitid_name(dev, id), id,
                command, controlselector);
 
        if ((size == 0) || (buf == NULL)) {
@@ -452,9 +452,7 @@ int saa7164_cmd_send(struct saa7164_dev *dev, u8 id, enum tmComResCmd command,
                if (presponse_t->seqno != pcommand_t->seqno) {
 
                        dprintk(DBGLVL_CMD,
-                               "wrong event: seqno = %d, "
-                               "expected seqno = %d, "
-                               "will dequeue regardless\n",
+                               "wrong event: seqno = %d, expected seqno = %d, will dequeue regardless\n",
                                presponse_t->seqno, pcommand_t->seqno);
 
                        ret = saa7164_cmd_dequeue(dev);

diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index 8bbd092fbe1db70052857584f598c3d0192236f3..03a1511a92be2c870951f199ec60ba06b441b97a 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -710,9 +710,7 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id)
                                } else {
                                        /* Find the function */
                                        dprintk(DBGLVL_IRQ,
-                                               "%s() unhandled interrupt "
-                                               "reg 0x%x bit 0x%x "
-                                               "intid = 0x%x\n",
+                                               "%s() unhandled interrupt reg 0x%x bit 0x%x intid = 0x%x\n",
                                                __func__, i, bit, intid);
                                }
                        }
@@ -767,13 +765,11 @@ void saa7164_dumpregs(struct saa7164_dev *dev, u32 addr)
 {
        int i;
 
-       dprintk(1, "--------------------> "
-               "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f\n");
+       dprintk(1, "--------------------> 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f\n");
 
        for (i = 0; i < 0x100; i += 16)
-               dprintk(1, "region0[0x%08x] = "
-                       "%02x %02x %02x %02x %02x %02x %02x %02x"
-                       " %02x %02x %02x %02x %02x %02x %02x %02x\n", i,
+               dprintk(1, "region0[0x%08x] = %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
+                       i,
                        (u8)saa7164_readb(addr + i + 0),
                        (u8)saa7164_readb(addr + i + 1),
                        (u8)saa7164_readb(addr + i + 2),
@@ -825,8 +821,7 @@ static void saa7164_dump_hwdesc(struct saa7164_dev *dev)
 
 static void saa7164_dump_intfdesc(struct saa7164_dev *dev)
 {
-       dprintk(1, "@0x%p intfdesc "
-               "sizeof(struct tmComResInterfaceDescr) = %d bytes\n",
+       dprintk(1, "@0x%p intfdesc sizeof(struct tmComResInterfaceDescr) = %d bytes\n",
                &dev->intfdesc, (u32)sizeof(struct tmComResInterfaceDescr));
 
        dprintk(1, " .bLength = 0x%x\n", dev->intfdesc.bLength);
@@ -1011,8 +1006,7 @@ static int saa7164_dev_setup(struct saa7164_dev *dev)
        saa7164_port_init(dev, SAA7164_PORT_VBI2);
 
        if (get_resources(dev) < 0) {
-               printk(KERN_ERR "CORE %s No more PCIe resources for "
-                      "subsystem: %04x:%04x\n",
+               printk(KERN_ERR "CORE %s No more PCIe resources for subsystem: %04x:%04x\n",
                       dev->name, dev->pci->subsystem_vendor,
                       dev->pci->subsystem_device);
 
@@ -1204,8 +1198,8 @@ static bool saa7164_enable_msi(struct pci_dev *pci_dev, struct saa7164_dev *dev)
        err = pci_enable_msi(pci_dev);
 
        if (err) {
-               printk(KERN_ERR "%s() Failed to enable MSI interrupt."
-                       " Falling back to a shared IRQ\n", __func__);
+               printk(KERN_ERR "%s() Failed to enable MSI interrupt. Falling back to a shared IRQ\n",
+                      __func__);
                return false;
        }
 
@@ -1215,8 +1209,8 @@ static bool saa7164_enable_msi(struct pci_dev *pci_dev, struct saa7164_dev *dev)
 
        if (err) {
                /* fall back to legacy interrupt */
-               printk(KERN_ERR "%s() Failed to get an MSI interrupt."
-                      " Falling back to a shared IRQ\n", __func__);
+               printk(KERN_ERR "%s() Failed to get an MSI interrupt. Falling back to a shared IRQ\n",
+                      __func__);
                pci_disable_msi(pci_dev);
                return false;
        }
@@ -1256,8 +1250,8 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
        /* print pci info */
        dev->pci_rev = pci_dev->revision;
        pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER,  &dev->pci_lat);
-       printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, "
-              "latency: %d, mmio: 0x%llx\n", dev->name,
+       printk(KERN_INFO "%s/0: found at %s, rev: %d, irq: %d, latency: %d, mmio: 0x%llx\n",
+              dev->name,
               pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
               dev->pci_lat,
                (unsigned long long)pci_resource_start(pci_dev, 0));
@@ -1307,8 +1301,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
                err = saa7164_downloadfirmware(dev);
                if (err < 0) {
                        printk(KERN_ERR
-                               "Failed to boot firmware, no features "
-                               "registered\n");
+                               "Failed to boot firmware, no features registered\n");
                        goto fail_fw;
                }
 
@@ -1327,8 +1320,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
                 */
                version = 0;
                if (saa7164_api_get_fw_version(dev, &version) == SAA_OK)
-                       dprintk(1, "Bus is operating correctly using "
-                               "version %d.%d.%d.%d (0x%x)\n",
+                       dprintk(1, "Bus is operating correctly using version %d.%d.%d.%d (0x%x)\n",
                                (version & 0x0000fc00) >> 10,
                                (version & 0x000003e0) >> 5,
                                (version & 0x0000001f),
@@ -1356,45 +1348,43 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
                /* Begin to create the video sub-systems and register funcs */
                if (saa7164_boards[dev->board].porta == SAA7164_MPEG_DVB) {
                        if (saa7164_dvb_register(&dev->ports[SAA7164_PORT_TS1]) < 0) {
-                               printk(KERN_ERR "%s() Failed to register "
-                                       "dvb adapters on porta\n",
+                               printk(KERN_ERR "%s() Failed to register dvb adapters on porta\n",
                                        __func__);
                        }
                }
 
                if (saa7164_boards[dev->board].portb == SAA7164_MPEG_DVB) {
                        if (saa7164_dvb_register(&dev->ports[SAA7164_PORT_TS2]) < 0) {
-                               printk(KERN_ERR"%s() Failed to register "
-                                       "dvb adapters on portb\n",
+                               printk(KERN_ERR"%s() Failed to register dvb adapters on portb\n",
                                        __func__);
                        }
                }
 
                if (saa7164_boards[dev->board].portc == SAA7164_MPEG_ENCODER) {
                        if (saa7164_encoder_register(&dev->ports[SAA7164_PORT_ENC1]) < 0) {
-                               printk(KERN_ERR"%s() Failed to register "
-                                       "mpeg encoder\n", __func__);
+                               printk(KERN_ERR"%s() Failed to register mpeg encoder\n",
+                                      __func__);
                        }
                }
 
                if (saa7164_boards[dev->board].portd == SAA7164_MPEG_ENCODER) {
                        if (saa7164_encoder_register(&dev->ports[SAA7164_PORT_ENC2]) < 0) {
-                               printk(KERN_ERR"%s() Failed to register "
-                                       "mpeg encoder\n", __func__);
+                               printk(KERN_ERR"%s() Failed to register mpeg encoder\n",
+                                      __func__);
                        }
                }
 
                if (saa7164_boards[dev->board].porte == SAA7164_MPEG_VBI) {
                        if (saa7164_vbi_register(&dev->ports[SAA7164_PORT_VBI1]) < 0) {
-                               printk(KERN_ERR"%s() Failed to register "
-                                       "vbi device\n", __func__);
+                               printk(KERN_ERR"%s() Failed to register vbi device\n",
+                                      __func__);
                        }
                }
 
                if (saa7164_boards[dev->board].portf == SAA7164_MPEG_VBI) {
                        if (saa7164_vbi_register(&dev->ports[SAA7164_PORT_VBI2]) < 0) {
-                               printk(KERN_ERR"%s() Failed to register "
-                                       "vbi device\n", __func__);
+                               printk(KERN_ERR"%s() Failed to register vbi device\n",
+                                      __func__);
                        }
                }
                saa7164_api_set_debug(dev, fw_debug);
@@ -1404,15 +1394,15 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
                                "saa7164 debug");
                        if (IS_ERR(dev->kthread)) {
                                dev->kthread = NULL;
-                               printk(KERN_ERR "%s() Failed to create "
-                                       "debug kernel thread\n", __func__);
+                               printk(KERN_ERR "%s() Failed to create debug kernel thread\n",
+                                      __func__);
                        }
                }
 
        } /* != BOARD_UNKNOWN */
        else
-               printk(KERN_ERR "%s() Unsupported board detected, "
-                       "registering without firmware\n", __func__);
+               printk(KERN_ERR "%s() Unsupported board detected, registering without firmware\n",
+                      __func__);
 
        dprintk(1, "%s() parameter debug = %d\n", __func__, saa_debug);
        dprintk(1, "%s() parameter waitsecs = %d\n", __func__, waitsecs);

diff --git a/drivers/media/pci/saa7164/saa7164-dvb.c b/drivers/media/pci/saa7164/saa7164-dvb.c
index e9a783b71b4523282d741b451f517b6b133e23d5..cd3eeda5250bf8bf113b0fe82c1139599452b3dd 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-dvb.c
+++ b/drivers/media/pci/saa7164/saa7164-dvb.c
@@ -244,8 +244,8 @@ static int saa7164_dvb_start_port(struct saa7164_port *port)
                /* Stop the hardware, regardless */
                result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
                if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
-                       printk(KERN_ERR "%s() acquire/forced stop transition "
-                               "failed, res = 0x%x\n", __func__, result);
+                       printk(KERN_ERR "%s() acquire/forced stop transition failed, res = 0x%x\n",
+                              __func__, result);
                }
                ret = -EIO;
                goto out;
@@ -261,8 +261,8 @@ static int saa7164_dvb_start_port(struct saa7164_port *port)
                /* Stop the hardware, regardless */
                result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
                if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
-                       printk(KERN_ERR "%s() pause/forced stop transition "
-                               "failed, res = 0x%x\n", __func__, result);
+                       printk(KERN_ERR "%s() pause/forced stop transition failed, res = 0x%x\n",
+                              __func__, result);
                }
 
                ret = -EIO;
@@ -279,8 +279,8 @@ static int saa7164_dvb_start_port(struct saa7164_port *port)
                /* Stop the hardware, regardless */
                result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
                if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
-                       printk(KERN_ERR "%s() run/forced stop transition "
-                               "failed, res = 0x%x\n", __func__, result);
+                       printk(KERN_ERR "%s() run/forced stop transition failed, res = 0x%x\n",
+                              __func__, result);
                }
 
                ret = -EIO;
@@ -357,8 +357,7 @@ static int dvb_register(struct saa7164_port *port)
        /* Sanity check that the PCI configuration space is active */
        if (port->hwcfg.BARLocation == 0) {
                result = -ENOMEM;
-               printk(KERN_ERR "%s: dvb_register_adapter failed "
-                      "(errno = %d), NO PCI configuration\n",
+               printk(KERN_ERR "%s: dvb_register_adapter failed (errno = %d), NO PCI configuration\n",
                        DRIVER_NAME, result);
                goto fail_adapter;
        }
@@ -386,8 +385,7 @@ static int dvb_register(struct saa7164_port *port)
 
                if (!buf) {
                        result = -ENOMEM;
-                       printk(KERN_ERR "%s: dvb_register_adapter failed "
-                              "(errno = %d), unable to allocate buffers\n",
+                       printk(KERN_ERR "%s: dvb_register_adapter failed (errno = %d), unable to allocate buffers\n",
                                DRIVER_NAME, result);
                        goto fail_adapter;
                }
@@ -401,8 +399,8 @@ static int dvb_register(struct saa7164_port *port)
        result = dvb_register_adapter(&dvb->adapter, DRIVER_NAME, THIS_MODULE,
                        &dev->pci->dev, adapter_nr);
        if (result < 0) {
-               printk(KERN_ERR "%s: dvb_register_adapter failed "
-                      "(errno = %d)\n", DRIVER_NAME, result);
+               printk(KERN_ERR "%s: dvb_register_adapter failed (errno = %d)\n",
+                      DRIVER_NAME, result);
                goto fail_adapter;
        }
        dvb->adapter.priv = port;
@@ -410,8 +408,8 @@ static int dvb_register(struct saa7164_port *port)
        /* register frontend */
        result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
        if (result < 0) {
-               printk(KERN_ERR "%s: dvb_register_frontend failed "
-                      "(errno = %d)\n", DRIVER_NAME, result);
+               printk(KERN_ERR "%s: dvb_register_frontend failed (errno = %d)\n",
+                      DRIVER_NAME, result);
                goto fail_frontend;
        }
 
@@ -444,16 +442,16 @@ static int dvb_register(struct saa7164_port *port)
        dvb->fe_hw.source = DMX_FRONTEND_0;
        result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_hw);
        if (result < 0) {
-               printk(KERN_ERR "%s: add_frontend failed "
-                      "(DMX_FRONTEND_0, errno = %d)\n", DRIVER_NAME, result);
+               printk(KERN_ERR "%s: add_frontend failed (DMX_FRONTEND_0, errno = %d)\n",
+                      DRIVER_NAME, result);
                goto fail_fe_hw;
        }
 
        dvb->fe_mem.source = DMX_MEMORY_FE;
        result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_mem);
        if (result < 0) {
-               printk(KERN_ERR "%s: add_frontend failed "
-                      "(DMX_MEMORY_FE, errno = %d)\n", DRIVER_NAME, result);
+               printk(KERN_ERR "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
+                      DRIVER_NAME, result);
                goto fail_fe_mem;
        }
 

diff --git a/drivers/media/pci/saa7164/saa7164-encoder.c b/drivers/media/pci/saa7164/saa7164-encoder.c
index 32a353d162e7950ef6f856297359434a2eebca15..68124ce7ebc39ab7ab158fa2fb26a19fe1fcd1c7 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-encoder.c
+++ b/drivers/media/pci/saa7164/saa7164-encoder.c
@@ -157,8 +157,7 @@ static int saa7164_encoder_buffers_alloc(struct saa7164_port *port)
                        params->pitch);
 
                if (!buf) {
-                       printk(KERN_ERR "%s() failed "
-                              "(errno = %d), unable to allocate buffer\n",
+                       printk(KERN_ERR "%s() failed (errno = %d), unable to allocate buffer\n",
                                __func__, result);
                        result = -ENOMEM;
                        goto failed;
@@ -681,8 +680,8 @@ static int saa7164_encoder_start_streaming(struct saa7164_port *port)
                /* Stop the hardware, regardless */
                result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
                if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
-                       printk(KERN_ERR "%s() acquire/forced stop transition "
-                               "failed, res = 0x%x\n", __func__, result);
+                       printk(KERN_ERR "%s() acquire/forced stop transition failed, res = 0x%x\n",
+                              __func__, result);
                }
                ret = -EIO;
                goto out;
@@ -698,8 +697,8 @@ static int saa7164_encoder_start_streaming(struct saa7164_port *port)
                /* Stop the hardware, regardless */
                result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
                if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
-                       printk(KERN_ERR "%s() pause/forced stop transition "
-                               "failed, res = 0x%x\n", __func__, result);
+                       printk(KERN_ERR "%s() pause/forced stop transition failed, res = 0x%x\n",
+                              __func__, result);
                }
 
                ret = -EIO;
@@ -716,8 +715,8 @@ static int saa7164_encoder_start_streaming(struct saa7164_port *port)
                /* Stop the hardware, regardless */
                result = saa7164_api_transition_port(port, SAA_DMASTATE_STOP);
                if ((result != SAA_OK) && (result != SAA_ERR_ALREADY_STOPPED)) {
-                       printk(KERN_ERR "%s() run/forced stop transition "
-                               "failed, res = 0x%x\n", __func__, result);
+                       printk(KERN_ERR "%s() run/forced stop transition failed, res = 0x%x\n",
+                              __func__, result);
                }
 
                ret = -EIO;
@@ -1026,8 +1025,7 @@ int saa7164_encoder_register(struct saa7164_port *port)
 
        /* Sanity check that the PCI configuration space is active */
        if (port->hwcfg.BARLocation == 0) {
-               printk(KERN_ERR "%s() failed "
-                      "(errno = %d), NO PCI configuration\n",
+               printk(KERN_ERR "%s() failed (errno = %d), NO PCI configuration\n",
                        __func__, result);
                result = -ENOMEM;
                goto failed;

diff --git a/drivers/media/pci/saa7164/saa7164-fw.c b/drivers/media/pci/saa7164/saa7164-fw.c
index 269e0782c7b64a36b773256cc318e99aef1059c3..8568adfd7ece9e1a48f2fa2f8a3ec12b2f9b0591 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-fw.c
+++ b/drivers/media/pci/saa7164/saa7164-fw.c
@@ -421,8 +421,8 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
 
                ret = request_firmware(&fw, fwname, &dev->pci->dev);
                if (ret) {
-                       printk(KERN_ERR "%s() Upload failed. "
-                               "(file not found?)\n", __func__);
+                       printk(KERN_ERR "%s() Upload failed. (file not found?)\n",
+                              __func__);
                        return -ENOMEM;
                }
 
@@ -478,15 +478,13 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
                                0x03) && (saa7164_readl(SAA_DATAREADY_FLAG_ACK)
                                == 0x00) && (version == 0x00)) {
 
-                               dprintk(DBGLVL_FW, "BootLoader version in  "
-                                       "rom %d.%d.%d.%d\n",
+                               dprintk(DBGLVL_FW, "BootLoader version in  rom %d.%d.%d.%d\n",
                                        (bootloaderversion & 0x0000fc00) >> 10,
                                        (bootloaderversion & 0x000003e0) >> 5,
                                        (bootloaderversion & 0x0000001f),
                                        (bootloaderversion & 0xffff0000) >> 16
                                        );
-                               dprintk(DBGLVL_FW, "BootLoader version "
-                                       "in file %d.%d.%d.%d\n",
+                               dprintk(DBGLVL_FW, "BootLoader version in file %d.%d.%d.%d\n",
                                        (boothdr->version & 0x0000fc00) >> 10,
                                        (boothdr->version & 0x000003e0) >> 5,
                                        (boothdr->version & 0x0000001f),

diff --git a/drivers/media/pci/saa7164/saa7164-vbi.c b/drivers/media/pci/saa7164/saa7164-vbi.c
index ee54491459a65ec2c3e1db67e43b507461725c55..e5dcb81029d3be2f74b2637ececf2fc3f5d62c4a 100644 (file)
--- a/drivers/media/pci/saa7164/saa7164-vbi.c
+++ b/drivers/media/pci/saa7164/saa7164-vbi.c
@@ -110,8 +110,7 @@ static int saa7164_vbi_buffers_alloc(struct saa7164_port *port)
                        params->pitch);
 
                if (!buf) {
-                       printk(KERN_ERR "%s() failed "
-                              "(errno = %d), unable to allocate buffer\n",
+                       printk(KERN_ERR "%s() failed (errno = %d), unable to allocate buffer\n",
                                __func__, result);
                        result = -ENOMEM;
                        goto failed;
@@ -384,8 +383,8 @@ static int saa7164_vbi_start_streaming(struct saa7164_port *port)
                /* Stop the hardware, regardless */
                result = saa7164_vbi_stop_port(port);
                if (result != SAA_OK) {
-                       printk(KERN_ERR "%s() pause/forced stop transition "
-                               "failed, res = 0x%x\n", __func__, result);
+                       printk(KERN_ERR "%s() pause/forced stop transition failed, res = 0x%x\n",
+                              __func__, result);
                }
 
                ret = -EIO;
@@ -403,8 +402,8 @@ static int saa7164_vbi_start_streaming(struct saa7164_port *port)
                result = saa7164_vbi_acquire_port(port);
                result = saa7164_vbi_stop_port(port);
                if (result != SAA_OK) {
-                       printk(KERN_ERR "%s() run/forced stop transition "
-                               "failed, res = 0x%x\n", __func__, result);
+                       printk(KERN_ERR "%s() run/forced stop transition failed, res = 0x%x\n",
+                              __func__, result);
                }
 
                ret = -EIO;
@@ -728,8 +727,7 @@ int saa7164_vbi_register(struct saa7164_port *port)
 
        /* Sanity check that the PCI configuration space is active */
        if (port->hwcfg.BARLocation == 0) {
-               printk(KERN_ERR "%s() failed "
-                      "(errno = %d), NO PCI configuration\n",
+               printk(KERN_ERR "%s() failed (errno = %d), NO PCI configuration\n",
                        __func__, result);
                result = -ENOMEM;
                goto failed;