From: Joe Perches <joe@perches.com>
Date: Fri, 4 Apr 2014 22:16:06 +0000 (-0700)
Subject: usb: ftdi-elan: Coalesce string fragment
X-Git-Tag: firefly_0821_release~176^2~3465^2~37^2~186
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a92cec2737d16c458ec04836d1271a832b56a2e6;p=firefly-linux-kernel-4.4.55.git

usb: ftdi-elan: Coalesce string fragment

Make it easier to grep for this.

Neaten a trailing statement.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
index 8cda8814a3ef..10c54b36d26c 100644
--- a/drivers/usb/misc/ftdi-elan.c
+++ b/drivers/usb/misc/ftdi-elan.c
@@ -55,8 +55,8 @@ MODULE_LICENSE("GPL");
 #define INT_MODULE_PARM(n, v) static int n = v;module_param(n, int, 0444)
 static bool distrust_firmware = 1;
 module_param(distrust_firmware, bool, 0);
-MODULE_PARM_DESC(distrust_firmware, "true to distrust firmware power/overcurren"
-		 "t setup");
+MODULE_PARM_DESC(distrust_firmware,
+		 "true to distrust firmware power/overcurrent setup");
 extern struct platform_driver u132_platform_driver;
 static struct workqueue_struct *status_queue;
 static struct workqueue_struct *command_queue;
@@ -590,8 +590,7 @@ static void ftdi_elan_status_work(struct work_struct *work)
 				ftdi_elan_flush_targets(ftdi);
 			work_delay_in_msec = 250;
 		} else {
-			dev_err(&ftdi->udev->dev, "PCI device has disappeared\n"
-				);
+			dev_err(&ftdi->udev->dev, "PCI device has disappeared\n");
 			ftdi_elan_cancel_targets(ftdi);
 			work_delay_in_msec = 500;
 			ftdi->enumerated = 0;