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/usb/hdpvr/hdpvr-core.c  | 9 +++------
 drivers/media/usb/hdpvr/hdpvr-i2c.c   | 6 ++----
 drivers/media/usb/hdpvr/hdpvr-video.c | 4 +---
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c 
b/drivers/media/usb/hdpvr/hdpvr-core.c
index a61d8fd63c12..15f016ad5b89 100644
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -41,13 +41,11 @@ MODULE_PARM_DESC(hdpvr_debug, "enable debugging output");
 
 static uint default_video_input = HDPVR_VIDEO_INPUTS;
 module_param(default_video_input, uint, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(default_video_input, "default video input: 0=Component / "
-                "1=S-Video / 2=Composite");
+MODULE_PARM_DESC(default_video_input, "default video input: 0=Component / 
1=S-Video / 2=Composite");
 
 static uint default_audio_input = HDPVR_AUDIO_INPUTS;
 module_param(default_audio_input, uint, S_IRUGO|S_IWUSR);
-MODULE_PARM_DESC(default_audio_input, "default audio input: 0=RCA back / "
-                "1=RCA front / 2=S/PDIF");
+MODULE_PARM_DESC(default_audio_input, "default audio input: 0=RCA back / 1=RCA 
front / 2=S/PDIF");
 
 static bool boost_audio;
 module_param(boost_audio, bool, S_IRUGO|S_IWUSR);
@@ -165,8 +163,7 @@ static int device_authorization(struct hdpvr_device *dev)
                dev->flags |= HDPVR_FLAG_AC3_CAP;
                break;
        default:
-               v4l2_info(&dev->v4l2_dev, "untested firmware, the driver might"
-                         " not work.\n");
+               v4l2_info(&dev->v4l2_dev, "untested firmware, the driver might 
not work.\n");
                if (dev->fw_ver >= HDPVR_FIRMWARE_VERSION_AC3)
                        dev->flags |= HDPVR_FLAG_AC3_CAP;
                else
diff --git a/drivers/media/usb/hdpvr/hdpvr-i2c.c 
b/drivers/media/usb/hdpvr/hdpvr-i2c.c
index 9b641c4d4431..db750e7da323 100644
--- a/drivers/media/usb/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/usb/hdpvr/hdpvr-i2c.c
@@ -145,15 +145,13 @@ static int hdpvr_transfer(struct i2c_adapter 
*i2c_adapter, struct i2c_msg *msgs,
                                                 msgs[0].len);
        } else if (num == 2) {
                if (msgs[0].addr != msgs[1].addr) {
-                       v4l2_warn(&dev->v4l2_dev, "refusing 2-phase i2c xfer "
-                                 "with conflicting target addresses\n");
+                       v4l2_warn(&dev->v4l2_dev, "refusing 2-phase i2c xfer 
with conflicting target addresses\n");
                        retval = -EINVAL;
                        goto out;
                }
 
                if ((msgs[0].flags & I2C_M_RD) || !(msgs[1].flags & I2C_M_RD)) {
-                       v4l2_warn(&dev->v4l2_dev, "refusing complex xfer with "
-                                 "r0=%d, r1=%d\n", msgs[0].flags & I2C_M_RD,
+                       v4l2_warn(&dev->v4l2_dev, "refusing complex xfer with 
r0=%d, r1=%d\n", msgs[0].flags & I2C_M_RD,
                                  msgs[1].flags & I2C_M_RD);
                        retval = -EINVAL;
                        goto out;
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c 
b/drivers/media/usb/hdpvr/hdpvr-video.c
index 6d43d75493ea..a247063c5816 100644
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -337,9 +337,7 @@ static int hdpvr_stop_streaming(struct hdpvr_device *dev)
 
        buf = kmalloc(dev->bulk_in_size, GFP_KERNEL);
        if (!buf)
-               v4l2_err(&dev->v4l2_dev, "failed to allocate temporary buffer "
-                        "for emptying the internal device buffer. "
-                        "Next capture start will be slow\n");
+               v4l2_err(&dev->v4l2_dev, "failed to allocate temporary buffer 
for emptying the internal device buffer. Next capture start will be slow\n");
 
        dev->status = STATUS_SHUTTING_DOWN;
        hdpvr_config_call(dev, CTRL_STOP_STREAMING_VALUE, 0x00);
-- 
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