upstream: Staging: lirc: fix quoted string split across lines

This patch removes the following warning reported by checkpatch.pl

WARNING: quoted string split across lines

drivers/staging/media/lirc/lirc_igorplugusb.c
drivers/staging/media/lirc/lirc_imon.c
drivers/staging/media/lirc/lirc_serial.c
drivers/staging/media/lirc/lirc_zilog.c

Signed-off-by: Matina Maria Trompouki <mtrompou@gmail.com>
Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/media/lirc/lirc_igorplugusb.c b/drivers/staging/media/lirc/lirc_igorplugusb.c
index 28c8b0b..f2dcc4a 100644 (file)
--- a/drivers/staging/media/lirc/lirc_igorplugusb.c
+++ b/drivers/staging/media/lirc/lirc_igorplugusb.c
@@ -363,8 +363,8 @@ static int igorplugusb_remote_poll(void *data, struct lirc_buffer *buf)
                      /*dummy*/ir->buf_in, /*dummy*/ir->len_in,
                      /*timeout*/HZ * USB_CTRL_GET_TIMEOUT);
                if (ret < 0)
-                       printk(DRIVER_NAME "[%d]: SET_INFRABUFFER_EMPTY: "
-                              "error %d\n", ir->devnum, ret);
+                       printk(DRIVER_NAME "[%d]: SET_INFRABUFFER_EMPTY: error %d\n",
+                              ir->devnum, ret);
                return 0;
        } else if (ret < 0)
                printk(DRIVER_NAME "[%d]: GET_INFRACODE: error %d\n",

diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c
index ab2ae11..663c963 100644 (file)
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@ -878,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;
@@ -923,8 +923,8 @@ 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__);
                }
        }
 

diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index e38c4a3..abe0d5c 100644 (file)
--- a/drivers/staging/media/lirc/lirc_serial.c
+++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -428,8 +428,8 @@ static int init_timing_params(unsigned int new_duty_cycle,
        period = 256 * 1000000L / freq;
        pulse_width = period * duty_cycle / 100;
        space_width = period - pulse_width;
-       dprintk("in init_timing_params, freq=%d pulse=%ld, "
-               "space=%ld\n", freq, pulse_width, space_width);
+       dprintk("in init_timing_params, freq=%d pulse=%ld, space=%ld\n",
+               freq, pulse_width, space_width);
        return 0;
 }
 #endif /* USE_RDTSC */

diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c
index 0feeaad..e1feb61 100644 (file)
--- a/drivers/staging/media/lirc/lirc_zilog.c
+++ b/drivers/staging/media/lirc/lirc_zilog.c
@@ -767,8 +767,8 @@ static int fw_load(struct IR_tx *tx)
        /* Request codeset data file */
        ret = request_firmware(&fw_entry, "haup-ir-blaster.bin", tx->ir->l.dev);
        if (ret != 0) {
-               zilog_error("firmware haup-ir-blaster.bin not available "
-                           "(%d)\n", ret);
+               zilog_error("firmware haup-ir-blaster.bin not available (%d)\n",
+                           ret);
                ret = ret < 0 ? ret : -EFAULT;
                goto out;
        }