Due to the 80-cols 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. So, join those continuation
lines.

Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com>
---
 drivers/media/pci/meye/meye.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index ba887e8e1b17..11d81389ab1e 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -60,8 +60,7 @@ MODULE_PARM_DESC(gbuffers, "number of capture buffers, 
default is 2 (32 max)");
 /* size of a grab buffer */
 static unsigned int gbufsize = MEYE_MAX_BUFSIZE;
 module_param(gbufsize, int, 0444);
-MODULE_PARM_DESC(gbufsize, "size of the capture buffers, default is 614400"
-                " (will be rounded up to a page multiple)");
+MODULE_PARM_DESC(gbufsize, "size of the capture buffers, default is 614400 
(will be rounded up to a page multiple)");
 
 /* /dev/videoX registration number */
 static int video_nr = -1;
@@ -1261,8 +1260,7 @@ static int vidioc_reqbufs(struct file *file, void *fh,
        meye.grab_fbuffer = rvmalloc(gbuffers * gbufsize);
 
        if (!meye.grab_fbuffer) {
-               printk(KERN_ERR "meye: v4l framebuffer allocation"
-                               " failed\n");
+               printk(KERN_ERR "meye: v4l framebuffer allocation failed\n");
                mutex_unlock(&meye.lock);
                return -ENOMEM;
        }
@@ -1659,8 +1657,7 @@ static int meye_probe(struct pci_dev *pcidev, const 
struct pci_device_id *ent)
        ret = -EIO;
        if ((ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1))) {
                v4l2_err(v4l2_dev, "meye: unable to power on the camera\n");
-               v4l2_err(v4l2_dev, "meye: did you enable the camera in "
-                               "sonypi using the module options ?\n");
+               v4l2_err(v4l2_dev, "meye: did you enable the camera in sonypi 
using the module options ?\n");
                goto outsonypienable;
        }
 
@@ -1834,8 +1831,7 @@ static int __init meye_init(void)
        if (gbufsize > MEYE_MAX_BUFSIZE)
                gbufsize = MEYE_MAX_BUFSIZE;
        gbufsize = PAGE_ALIGN(gbufsize);
-       printk(KERN_INFO "meye: using %d buffers with %dk (%dk total) "
-                        "for capture\n",
+       printk(KERN_INFO "meye: using %d buffers with %dk (%dk total) for 
capture\n",
                         gbuffers,
                         gbufsize / 1024, gbuffers * gbufsize / 1024);
        return pci_register_driver(&meye_driver);
-- 
2.7.4


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to