diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-15 09:40:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-15 09:40:57 -0700 |
| commit | dc070641ee2df26da60fa9a1cbe446ee59ce4f0e (patch) | |
| tree | 5acf0db3c12c3f29e285770b0a4172f7ac41e328 /drivers/staging/media | |
| parent | e7ed40fb26942c74d3808e00d5711588a0cdc476 (diff) | |
Revert "staging:media:lirc: quoted string split across lines"
This reverts commit 7db78438d932d12afda5f367cfcb56337457e037.
It broke the build, and isn't ok.
Cc: Archana kumari <archanakumari959@gmail.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media')
| -rw-r--r-- | drivers/staging/media/lirc/lirc_imon.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c index 8180187d8ebd..4afa7da11f37 100644 --- a/drivers/staging/media/lirc/lirc_imon.c +++ b/drivers/staging/media/lirc/lirc_imon.c @@ -619,9 +619,8 @@ static void imon_incoming_packet(struct imon_context *context, return; if (len != 8) { - dev_warn(dev, - "imon %s: invalid incoming packet size (len = %d, intf%d)\n", - __func__, len, intf); + dev_warn(dev, "imon %s: invalid incoming packet " + "size (len = %d, intf%d)\n", __func__, len, intf); return; } @@ -879,8 +878,8 @@ static int imon_probe(struct usb_interface *interface, alloc_status = 7; goto unlock; } else - dev_info(dev, "Registered iMON driver (lirc minor: %d)\n", - lirc_minor); + dev_info(dev, "Registered iMON driver " + "(lirc minor: %d)\n", lirc_minor); /* Needed while unregistering! */ driver->minor = lirc_minor; @@ -924,16 +923,14 @@ static int imon_probe(struct usb_interface *interface, if (usb_register_dev(interface, &imon_class)) { /* Not a fatal error, so ignore */ - dev_info(dev, - "%s: could not get a minor number for display\n" - __func__); + dev_info(dev, "%s: could not get a minor number for " + "display\n", __func__); } } - dev_info(dev, - "iMON device (%04x:%04x, intf%d) on usb<%d:%d> initialized\n", - vendor, product, ifnum, usbdev->bus->busnum, - usbdev->devnum); + dev_info(dev, "iMON device (%04x:%04x, intf%d) on " + "usb<%d:%d> initialized\n", vendor, product, ifnum, + usbdev->bus->busnum, usbdev->devnum); unlock: mutex_unlock(&context->ctx_lock); |