Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit a92cec2737d16c458ec04836d1271a832b56a2e6

Authored by Joe Perches
Committed by Greg Kroah-Hartman
1 parent 5acc6e4071
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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>

Showing 1 changed file with 3 additions and 4 deletions Side-by-side Diff

drivers/usb/misc/ftdi-elan.c
Diff comments   View file @ a92cec2
... ... @@ -55,8 +55,8 @@
55 55 #define INT_MODULE_PARM(n, v) static int n = v;module_param(n, int, 0444)
56 56 static bool distrust_firmware = 1;
57 57 module_param(distrust_firmware, bool, 0);
58   -MODULE_PARM_DESC(distrust_firmware, "true to distrust firmware power/overcurren"
59   - "t setup");
  58 +MODULE_PARM_DESC(distrust_firmware,
  59 + "true to distrust firmware power/overcurrent setup");
60 60 extern struct platform_driver u132_platform_driver;
61 61 static struct workqueue_struct *status_queue;
62 62 static struct workqueue_struct *command_queue;
... ... @@ -590,8 +590,7 @@
590 590 ftdi_elan_flush_targets(ftdi);
591 591 work_delay_in_msec = 250;
592 592 } else {
593   - dev_err(&ftdi->udev->dev, "PCI device has disappeared\n"
594   - );
  593 + dev_err(&ftdi->udev->dev, "PCI device has disappeared\n");
595 594 ftdi_elan_cancel_targets(ftdi);
596 595 work_delay_in_msec = 500;
597 596 ftdi->enumerated = 0;