aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2014-04-04 18:16:06 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-04-24 16:13:59 -0400
commita92cec2737d16c458ec04836d1271a832b56a2e6 (patch)
treea7e69d0c5d0f08127b3adef314c6d2c031aa1f7e
parent5acc6e40713cbd754c8d4162f77d6fd062d22317 (diff)
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>
-rw-r--r--drivers/usb/misc/ftdi-elan.c7
1 files changed, 3 insertions, 4 deletions
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");
55#define INT_MODULE_PARM(n, v) static int n = v;module_param(n, int, 0444) 55#define INT_MODULE_PARM(n, v) static int n = v;module_param(n, int, 0444)
56static bool distrust_firmware = 1; 56static bool distrust_firmware = 1;
57module_param(distrust_firmware, bool, 0); 57module_param(distrust_firmware, bool, 0);
58MODULE_PARM_DESC(distrust_firmware, "true to distrust firmware power/overcurren" 58MODULE_PARM_DESC(distrust_firmware,
59 "t setup"); 59 "true to distrust firmware power/overcurrent setup");
60extern struct platform_driver u132_platform_driver; 60extern struct platform_driver u132_platform_driver;
61static struct workqueue_struct *status_queue; 61static struct workqueue_struct *status_queue;
62static struct workqueue_struct *command_queue; 62static struct workqueue_struct *command_queue;
@@ -590,8 +590,7 @@ static void ftdi_elan_status_work(struct work_struct *work)
590 ftdi_elan_flush_targets(ftdi); 590 ftdi_elan_flush_targets(ftdi);
591 work_delay_in_msec = 250; 591 work_delay_in_msec = 250;
592 } else { 592 } else {
593 dev_err(&ftdi->udev->dev, "PCI device has disappeared\n" 593 dev_err(&ftdi->udev->dev, "PCI device has disappeared\n");
594 );
595 ftdi_elan_cancel_targets(ftdi); 594 ftdi_elan_cancel_targets(ftdi);
596 work_delay_in_msec = 500; 595 work_delay_in_msec = 500;
597 ftdi->enumerated = 0; 596 ftdi->enumerated = 0;