[media] gspca: 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/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index af2395a76d8bf930f35bdf1afab4593ae65d162c..fa2cbb981905a4908d19dd793a1138bc3bcf7ab4 100644 (file)
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -201,8 +201,7 @@ static int alloc_and_submit_int_urb(struct gspca_dev *gspca_dev,
 
        buffer_len = le16_to_cpu(ep->wMaxPacketSize);
        interval = ep->bInterval;
-       PDEBUG(D_CONF, "found int in endpoint: 0x%x, "
-               "buffer_len=%u, interval=%u",
+       PDEBUG(D_CONF, "found int in endpoint: 0x%x, buffer_len=%u, interval=%u",
                ep->bEndpointAddress, buffer_len, interval);
 
        dev = gspca_dev->dev;

diff --git a/drivers/media/usb/gspca/m5602/m5602_core.c b/drivers/media/usb/gspca/m5602/m5602_core.c
index e4a0658e3f833ab10132332664da0abeaf871b4e..f1dcd90219838269ed056e9b75fdd599e6570c7c 100644 (file)
--- a/drivers/media/usb/gspca/m5602/m5602_core.c
+++ b/drivers/media/usb/gspca/m5602/m5602_core.c
@@ -154,8 +154,8 @@ int m5602_read_sensor(struct sd *sd, const u8 address,
 
                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
 
-               PDEBUG(D_CONF, "Reading sensor register "
-                              "0x%x containing 0x%x ", address, *i2c_data);
+               PDEBUG(D_CONF, "Reading sensor register 0x%x containing 0x%x ",
+                      address, *i2c_data);
        }
        return err;
 }
@@ -441,13 +441,10 @@ MODULE_DESCRIPTION(DRIVER_DESC);
 MODULE_LICENSE("GPL");
 module_param(force_sensor, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(force_sensor,
-               "forces detection of a sensor, "
-               "1 = OV9650, 2 = S5K83A, 3 = S5K4AA, "
-               "4 = MT9M111, 5 = PO1030, 6 = OV7660");
+               "forces detection of a sensor, 1 = OV9650, 2 = S5K83A, 3 = S5K4AA, 4 = MT9M111, 5 = PO1030, 6 = OV7660");
 
 module_param(dump_bridge, bool, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(dump_bridge, "Dumps all usb bridge registers at startup");
 
 module_param(dump_sensor, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(dump_sensor, "Dumps all usb sensor registers "
-               "at startup providing a sensor is found");
+MODULE_PARM_DESC(dump_sensor, "Dumps all usb sensor registers at startup providing a sensor is found");

diff --git a/drivers/media/usb/gspca/mr97310a.c b/drivers/media/usb/gspca/mr97310a.c
index f006e29ca0197b66ec62dfd821dcb520e24635bf..6dfb364094ec769937515d7d2d086d4a135a5865 100644 (file)
--- a/drivers/media/usb/gspca/mr97310a.c
+++ b/drivers/media/usb/gspca/mr97310a.c
@@ -72,8 +72,7 @@
 #define MR97310A_MIN_CLOCKDIV_MAX      8
 #define MR97310A_MIN_CLOCKDIV_DEFAULT  3
 
-MODULE_AUTHOR("Kyle Guinn <elyk03@gmail.com>,"
-             "Theodore Kilgore <kilgota@auburn.edu>");
+MODULE_AUTHOR("Kyle Guinn <elyk03@gmail.com>,Theodore Kilgore <kilgota@auburn.edu>");
 MODULE_DESCRIPTION("GSPCA/Mars-Semi MR97310A USB Camera Driver");
 MODULE_LICENSE("GPL");
 

diff --git a/drivers/media/usb/gspca/ov519.c b/drivers/media/usb/gspca/ov519.c
index 965372a5ff2f3821e1bdbdaba79ee7da17895212..4dbca54cf2a83de08a743f2c8969ff465b2632ed 100644 (file)
--- a/drivers/media/usb/gspca/ov519.c
+++ b/drivers/media/usb/gspca/ov519.c
@@ -4326,8 +4326,7 @@ static void ov511_pkt_scan(struct gspca_dev *gspca_dev,
                        /* Frame end */
                        if ((in[9] + 1) * 8 != gspca_dev->pixfmt.width ||
                            (in[10] + 1) * 8 != gspca_dev->pixfmt.height) {
-                               PERR("Invalid frame size, got: %dx%d,"
-                                       " requested: %dx%d\n",
+                               PERR("Invalid frame size, got: %dx%d, requested: %dx%d\n",
                                        (in[9] + 1) * 8, (in[10] + 1) * 8,
                                        gspca_dev->pixfmt.width,
                                        gspca_dev->pixfmt.height);

diff --git a/drivers/media/usb/gspca/pac207.c b/drivers/media/usb/gspca/pac207.c
index 07529e5a0c5605186b3aa619b6b89d06cf98bc45..51e11248bbb837a60df723f8310f80f4f53a0fcd 100644 (file)
--- a/drivers/media/usb/gspca/pac207.c
+++ b/drivers/media/usb/gspca/pac207.c
@@ -179,8 +179,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
        }
 
        PDEBUG(D_PROBE,
-               "Pixart PAC207BCA Image Processor and Control Chip detected"
-               " (vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
+               "Pixart PAC207BCA Image Processor and Control Chip detected (vid/pid 0x%04X:0x%04X)",
+               id->idVendor, id->idProduct);
 
        cam = &gspca_dev->cam;
        cam->cam_mode = sif_mode;

diff --git a/drivers/media/usb/gspca/pac7302.c b/drivers/media/usb/gspca/pac7302.c
index 8b08bd0172f409d531b603fec366129b1455abac..be07a24c4518f10cbb97aee99eb9120139ed13cc 100644 (file)
--- a/drivers/media/usb/gspca/pac7302.c
+++ b/drivers/media/usb/gspca/pac7302.c
@@ -105,8 +105,7 @@
 #define PAC7302_EXPOSURE_DEFAULT        66 /* 33 ms / 30 fps */
 #define PAC7302_EXPOSURE_KNEE          133 /* 66 ms / 15 fps */
 
-MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>, "
-               "Thomas Kaiser thomas@kaiser-linux.li");
+MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>, Thomas Kaiser thomas@kaiser-linux.li");
 MODULE_DESCRIPTION("Pixart PAC7302");
 MODULE_LICENSE("GPL");
 

diff --git a/drivers/media/usb/gspca/sn9c20x.c b/drivers/media/usb/gspca/sn9c20x.c
index 10269dad9d201adac6b50e5d9aac7238537e315f..e7430b06526ae25030e0f960bbbcc021435448c6 100644 (file)
--- a/drivers/media/usb/gspca/sn9c20x.c
+++ b/drivers/media/usb/gspca/sn9c20x.c
@@ -29,8 +29,7 @@
 
 #include <linux/dmi.h>
 
-MODULE_AUTHOR("Brian Johnson <brijohn@gmail.com>, "
-               "microdia project <microdia@googlegroups.com>");
+MODULE_AUTHOR("Brian Johnson <brijohn@gmail.com>, microdia project <microdia@googlegroups.com>");
 MODULE_DESCRIPTION("GSPCA/SN9C20X USB Camera Driver");
 MODULE_LICENSE("GPL");
 
@@ -1948,8 +1947,7 @@ static int sd_isoc_init(struct gspca_dev *gspca_dev)
                intf = usb_ifnum_to_if(gspca_dev->dev, gspca_dev->iface);
 
                if (intf->num_altsetting != 9) {
-                       pr_warn("sn9c20x camera with unknown number of alt "
-                               "settings (%d), please report!\n",
+                       pr_warn("sn9c20x camera with unknown number of alt settings (%d), please report!\n",
                                intf->num_altsetting);
                        gspca_dev->alt = intf->num_altsetting;
                        return 0;

diff --git a/drivers/media/usb/gspca/sq905.c b/drivers/media/usb/gspca/sq905.c
index a7ae0ec9fa919a7b108793ec7500f5b7b44d5068..9424c33f0ddb839023b3bb384374718e0b74e417 100644 (file)
--- a/drivers/media/usb/gspca/sq905.c
+++ b/drivers/media/usb/gspca/sq905.c
@@ -41,8 +41,7 @@
 #include <linux/slab.h>
 #include "gspca.h"
 
-MODULE_AUTHOR("Adam Baker <linux@baker-net.org.uk>, "
-               "Theodore Kilgore <kilgota@auburn.edu>");
+MODULE_AUTHOR("Adam Baker <linux@baker-net.org.uk>, Theodore Kilgore <kilgota@auburn.edu>");
 MODULE_DESCRIPTION("GSPCA/SQ905 USB Camera Driver");
 MODULE_LICENSE("GPL");
 

diff --git a/drivers/media/usb/gspca/sq905c.c b/drivers/media/usb/gspca/sq905c.c
index aa21edc9502d67466f7ed13959d85709b9e36889..e02b8c1d06a208e7f456b89b388e5c6840233d2d 100644 (file)
--- a/drivers/media/usb/gspca/sq905c.c
+++ b/drivers/media/usb/gspca/sq905c.c
@@ -210,8 +210,8 @@ static int sd_config(struct gspca_dev *gspca_dev,
        int ret;
 
        PDEBUG(D_PROBE,
-               "SQ9050 camera detected"
-               " (vid/pid 0x%04X:0x%04X)", id->idVendor, id->idProduct);
+              "SQ9050 camera detected (vid/pid 0x%04X:0x%04X)",
+              id->idVendor, id->idProduct);
 
        ret = sq905c_command(gspca_dev, SQ905C_GET_ID, 0);
        if (ret < 0) {

diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx.c b/drivers/media/usb/gspca/stv06xx/stv06xx.c
index 6ac93d8db427fb70c79e5bba6a35929699dc050f..562ddb050cfd643505b026d4d799bbeaa7a457de 100644 (file)
--- a/drivers/media/usb/gspca/stv06xx/stv06xx.c
+++ b/drivers/media/usb/gspca/stv06xx/stv06xx.c
@@ -412,8 +412,7 @@ static void stv06xx_pkt_scan(struct gspca_dev *gspca_dev,
                len -= 4;
 
                if (len < chunk_len) {
-                       PERR("URB packet length is smaller"
-                               " than the specified chunk length");
+                       PERR("URB packet length is smaller than the specified chunk length");
                        gspca_dev->last_packet_type = DISCARD_PACKET;
                        return;
                }
@@ -455,8 +454,7 @@ frame_data:
                                sd->to_skip = gspca_dev->pixfmt.width * 4;
 
                        if (chunk_len)
-                               PERR("Chunk length is "
-                                             "non-zero on a SOF");
+                               PERR("Chunk length is non-zero on a SOF");
                        break;
 
                case 0x8002:
@@ -469,8 +467,7 @@ frame_data:
                                        NULL, 0);
 
                        if (chunk_len)
-                               PERR("Chunk length is "
-                                             "non-zero on a EOF");
+                               PERR("Chunk length is non-zero on a EOF");
                        break;
 
                case 0x0005:

diff --git a/drivers/media/usb/gspca/sunplus.c b/drivers/media/usb/gspca/sunplus.c
index 46c9f2229a18675c6a1ca39528dab2196937c0c5..38dc9e7aa313fc028c80f30a0ca68d684937a66f 100644 (file)
--- a/drivers/media/usb/gspca/sunplus.c
+++ b/drivers/media/usb/gspca/sunplus.c
@@ -368,8 +368,7 @@ static void spca504_read_info(struct gspca_dev *gspca_dev)
                info[i] = gspca_dev->usb_buf[0];
        }
        PDEBUG(D_STREAM,
-               "Read info: %d %d %d %d %d %d."
-               " Should be 1,0,2,2,0,0",
+               "Read info: %d %d %d %d %d %d. Should be 1,0,2,2,0,0",
                info[0], info[1], info[2],
                info[3], info[4], info[5]);
 }

diff --git a/drivers/media/usb/gspca/topro.c b/drivers/media/usb/gspca/topro.c
index 15eb069ab60b0f5cc30418596241cf6f53cae732..983fc6b500af078c8e5c40e6aa7126892d840ea6 100644 (file)
--- a/drivers/media/usb/gspca/topro.c
+++ b/drivers/media/usb/gspca/topro.c
@@ -24,8 +24,7 @@
 #include "gspca.h"
 
 MODULE_DESCRIPTION("Topro TP6800/6810 gspca webcam driver");
-MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>, "
-               "Anders Blomdell <anders.blomdell@control.lth.se>");
+MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>, Anders Blomdell <anders.blomdell@control.lth.se>");
 MODULE_LICENSE("GPL");
 
 static int force_sensor = -1;

diff --git a/drivers/media/usb/gspca/zc3xx.c b/drivers/media/usb/gspca/zc3xx.c
index 5f7254d2bc9a3c2a62b945e686dc62dd017aaadc..d5d8c7e81762310272caad6b60fe0dc5f0d1dd56 100644 (file)
--- a/drivers/media/usb/gspca/zc3xx.c
+++ b/drivers/media/usb/gspca/zc3xx.c
@@ -25,8 +25,7 @@
 #include "gspca.h"
 #include "jpeg.h"
 
-MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>, "
-               "Serge A. Suchkov <Serge.A.S@tochka.ru>");
+MODULE_AUTHOR("Jean-Francois Moine <http://moinejf.free.fr>, Serge A. Suchkov <Serge.A.S@tochka.ru>");
 MODULE_DESCRIPTION("GSPCA ZC03xx/VC3xx USB Camera Driver");
 MODULE_LICENSE("GPL");