[OPW,kernel] Staging: xillybus: fix quoted strings split across lines warnings
diff mbox

Message ID 70b5b95e-ced4-4934-ade8-53d8f7083922@googlegroups.com
State Changes Requested
Headers show

Commit Message

Ebru Akagündüz Oct. 3, 2013, 9:14 p.m. UTC
From 3da5fb36e12697c95a66ef40aeefe5c22f6e016d Mon Sep 17 00:00:00 2001
From: ebruAkagunduz <ebru.akagunduz@gmail.com>
Date: Thu, 3 Oct 2013 23:41:31 +0300
Subject: [PATCH] Staging: xillybus: fix quoted strings coding style issue in
 xillybus_core.c

This is a patch to the xillybus_core.c file that fixes quoted strings 
broken across lines warnings found by the checkpatch.pl

Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
---
 drivers/staging/xillybus/xillybus_core.c | 72 
++++++++++++++++----------------
 1 file changed, 36 insertions(+), 36 deletions(-)

  }
@@ -565,8 +565,8 @@ static int xilly_setupchannels(struct xilly_endpoint 
*ep,
  */
  if ((left_of_wr_salami < bytebufsize) &&
     (left_of_wr_salami > 0)) {
- pr_err("xillybus: "
-       "Corrupt buffer allocation "
+ pr_err("xillybus:\n"
+       "Corrupt buffer allocation\n"
        "in IDT. Aborting.\n");
  return -ENODEV;
  }
@@ -644,8 +644,8 @@ static int xilly_setupchannels(struct xilly_endpoint 
*ep,
  */
  if ((left_of_rd_salami < bytebufsize) &&
     (left_of_rd_salami > 0)) {
- pr_err("xillybus: "
-       "Corrupt buffer allocation "
+ pr_err("xillybus:\n"
+       "Corrupt buffer allocation\n"
        "in IDT. Aborting.\n");
  return -ENODEV;
  }
@@ -706,7 +706,7 @@ static int xilly_setupchannels(struct xilly_endpoint 
*ep,
  }
 
  if (!msg_buf_done) {
- pr_err("xillybus: Corrupt IDT: No message buffer. "
+ pr_err("xillybus: Corrupt IDT: No message buffer.\n"
        "Aborting.\n");
  return -ENODEV;
  }
@@ -714,7 +714,7 @@ static int xilly_setupchannels(struct xilly_endpoint 
*ep,
  return 0;
 
 memfail:
- pr_err("xillybus: Failed to allocate write buffer memory. "
+ pr_err("xillybus: Failed to allocate write buffer memory.\n"
        "Aborting.\n");
  return -ENOMEM;
 dmafail:
@@ -745,7 +745,7 @@ static void xilly_scan_idt(struct xilly_endpoint 
*endpoint,
  scan++;
 
  if (scan > end_of_idt) {
- pr_err("xillybus: IDT device name list overflow. "
+ pr_err("xillybus: IDT device name list overflow.\n"
        "Aborting.\n");
  idt_handle->chandesc = NULL;
  return;
@@ -757,7 +757,7 @@ static void xilly_scan_idt(struct xilly_endpoint 
*endpoint,
  if (len & 0x03) {
  idt_handle->chandesc = NULL;
 
- pr_err("xillybus: Corrupt IDT device name list. "
+ pr_err("xillybus: Corrupt IDT device name list.\n"
        "Aborting.\n");
  }
 
@@ -803,7 +803,7 @@ static int xilly_obtain_idt(struct xilly_endpoint 
*endpoint)
  DMA_FROM_DEVICE);
 
  if (channel->wr_buffers[0]->end_offset != endpoint->idtlen) {
- pr_err("xillybus: IDT length mismatch (%d != %d). "
+ pr_err("xillybus: IDT length mismatch (%d != %d).\n"
        "Aborting.\n",
        channel->wr_buffers[0]->end_offset, endpoint->idtlen);
  rc = -ENODEV;
@@ -821,8 +821,8 @@ static int xilly_obtain_idt(struct xilly_endpoint 
*endpoint)
 
  /* Check version number. Accept anything below 0x82 for now. */
  if (*version > 0x82) {
- pr_err("xillybus: No support for IDT version 0x%02x. "
-       "Maybe the xillybus driver needs an upgarde. "
+ pr_err("xillybus: No support for IDT version 0x%02x.\n"
+       "Maybe the xillybus driver needs an upgarde.\n"
        "Aborting.\n",
        (int) *version);
  rc = -ENODEV;
@@ -1312,8 +1312,8 @@ static int xillybus_myflush(struct xilly_channel 
*channel, long timeout)
  channel->rd_wait,
  (!channel->rd_full),
  timeout) == 0) {
- pr_warn("xillybus: "
- "Timed out while flushing. "
+ pr_warn("xillybus:\n"
+ "Timed out while flushing.\n"
  "Output data may be lost.\n");
 
  rc = -ETIMEDOUT;
@@ -1354,10 +1354,10 @@ static void xillybus_autoflush(struct work_struct 
*work)
  rc = xillybus_myflush(channel, -1);
 
  if (rc == -EINTR)
- pr_warn("xillybus: Autoflush failed because "
+ pr_warn("xillybus: Autoflush failed because\n"
  "work queue thread got a signal.\n");
  else if (rc)
- pr_err("xillybus: Autoflush failed under "
+ pr_err("xillybus: Autoflush failed under\n"
        "weird circumstances.\n");
 
 }
@@ -1615,7 +1615,7 @@ static int xillybus_open(struct inode *inode, struct 
file *filp)
  mutex_unlock(&ep_list_lock);
 
  if (!endpoint) {
- pr_err("xillybus: open() failed to find a device "
+ pr_err("xillybus: open() failed to find a device\n"
        "for major=%d and minor=%d\n", major, minor);
  return -ENODEV;
  }
@@ -1642,14 +1642,14 @@ static int xillybus_open(struct inode *inode, 
struct file *filp)
  if ((filp->f_mode & FMODE_READ) && (filp->f_flags & O_NONBLOCK) &&
     (channel->wr_synchronous || !channel->wr_allow_partial ||
      !channel->wr_supports_nonempty)) {
- pr_err("xillybus: open() failed: "
+ pr_err("xillybus: open() failed:\n"
        "O_NONBLOCK not allowed for read on this device\n");
  return -ENODEV;
  }
 
  if ((filp->f_mode & FMODE_WRITE) && (filp->f_flags & O_NONBLOCK) &&
     (channel->rd_synchronous || !channel->rd_allow_partial)) {
- pr_err("xillybus: open() failed: "
+ pr_err("xillybus: open() failed:\n"
        "O_NONBLOCK not allowed for write on this device\n");
  return -ENODEV;
  }
@@ -1765,7 +1765,7 @@ static int xillybus_release(struct inode *inode, 
struct file *filp)
  rc = mutex_lock_interruptible(&channel->rd_mutex);
 
  if (rc) {
- pr_warn("xillybus: Failed to close file. "
+ pr_warn("xillybus: Failed to close file.\n"
  "Hardware left in messy state.\n");
  return rc;
  }
@@ -1791,7 +1791,7 @@ static int xillybus_release(struct inode *inode, 
struct file *filp)
  if (filp->f_mode & FMODE_READ) {
  rc = mutex_lock_interruptible(&channel->wr_mutex);
  if (rc) {
- pr_warn("xillybus: Failed to close file. "
+ pr_warn("xillybus: Failed to close file.\n"
  "Hardware left in messy state.\n");
  return rc;
  }
@@ -1853,9 +1853,9 @@ static int xillybus_release(struct inode *inode, 
struct file *filp)
 
  if (channel->wr_sleepy) {
  mutex_unlock(&channel->wr_mutex);
- pr_warn("xillybus: Hardware failed to "
- "respond to close command, "
- "therefore left in "
+ pr_warn("xillybus: Hardware failed to\n"
+ "respond to close command,\n"
+ "therefore left in\n"
  "messy state.\n");
  return -EINTR;
  }
@@ -2057,7 +2057,7 @@ static int xillybus_init_chrdev(struct xilly_endpoint 
*endpoint,
        "%s", devname);
 
  if (IS_ERR(device)) {
- pr_warn("xillybus: Failed to create %s "
+ pr_warn("xillybus: Failed to create %s\n"
  "device. Aborting.\n", devname);
  goto error3;
  }
@@ -2141,7 +2141,7 @@ static int xilly_quiesce(struct xilly_endpoint 
*endpoint)
  XILLY_TIMEOUT);
 
  if (endpoint->idtlen < 0) {
- pr_err("xillybus: Failed to quiesce the device on "
+ pr_err("xillybus: Failed to quiesce the device on\n"
        "exit. Quitting while leaving a mess.\n");
  return -ENODEV;
  }

Comments

Greg KH Oct. 3, 2013, 9:26 p.m. UTC | #1
Hi,

Nice first patch, but there are some issues with it:

On Thu, Oct 03, 2013 at 02:14:45PM -0700, Ebru Akagündüz wrote:
> From 3da5fb36e12697c95a66ef40aeefe5c22f6e016d Mon Sep 17 00:00:00 2001
> From: ebruAkagunduz <ebru.akagunduz@gmail.com>
> Date: Thu, 3 Oct 2013 23:41:31 +0300
> Subject: [PATCH] Staging: xillybus: fix quoted strings coding style issue in
>  xillybus_core.c

This all shouldn't be here at all.  Just use 'git send-email' to send
the patch out, don't try to include it inline, as I would have to edit
this out if I were to apply the patch.

> This is a patch to the xillybus_core.c file that fixes quoted strings broken
> across lines warnings found by the checkpatch.pl
> 
> Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>

This is all good, but...

> ---
>  drivers/staging/xillybus/xillybus_core.c | 72 ++++++++++++++++----------------
>  1 file changed, 36 insertions(+), 36 deletions(-)
> 
> diff --git a/drivers/staging/xillybus/xillybus_core.c b/drivers/staging/
> xillybus/xillybus_core.c

Lines are wrapped, making the patch corrupted.

> index 7db6f03..0313139 100644
> --- a/drivers/staging/xillybus/xillybus_core.c
> +++ b/drivers/staging/xillybus/xillybus_core.c
> @@ -112,7 +112,7 @@ static void malformed_message(u32 *buf)
>   msg_bufno = (buf[0] >> 12) & 0x3ff;
>   msg_data = buf[1] & 0xfffffff;

Tabs got all stripped out, so this patch can't be applied.

>  
> - pr_warn("xillybus: Malformed message (skipping): "
> + pr_warn("xillybus: Malformed message (skipping):\n"
>   "opcode=%d, channel=%03x, dir=%d, bufno=%03x, data=%07x\n",

This isn't how you fix a multi-line string, you just messed up the
message in the kernel log by addding a new line for no real good reason.
The line should be:
	pr_warn("xillybus: Malformed message (skipping): opcode=%d, channel=%03x, dir=%d, bufno=%03x, data=%07x\n",

The string can be longer than 80 characters, although the "xillybus: "
prefix should be removed as the pr_* functions add it automatically if
it is set at the top of the file.

So, can you fix this all up and resend please?

thanks,

greg k-h
Sarah Sharp Oct. 3, 2013, 9:44 p.m. UTC | #2
Hi Ebru,

How did you send this patch?  With git-send-email, or mutt?

On Thu, Oct 03, 2013 at 02:14:45PM -0700, Ebru Akagündüz wrote:
> From 3da5fb36e12697c95a66ef40aeefe5c22f6e016d Mon Sep 17 00:00:00 2001
> From: ebruAkagunduz <ebru.akagunduz@gmail.com>
> Date: Thu, 3 Oct 2013 23:41:31 +0300
> Subject: [PATCH] Staging: xillybus: fix quoted strings coding style issue in
>  xillybus_core.c

I ask because the header above ^^^ is not the correct formating.  You
need to make the email body be the longer patch description, followed by
the patch.  So I'd like to understand what steps you took to send the
patch, so we can figure out what went wrong. :)

Sarah Sharp

> 
> This is a patch to the xillybus_core.c file that fixes quoted strings 
> broken across lines warnings found by the checkpatch.pl
> 
> Signed-off-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
> ---
>  drivers/staging/xillybus/xillybus_core.c | 72 
> ++++++++++++++++----------------
>  1 file changed, 36 insertions(+), 36 deletions(-)
> 
> diff --git a/drivers/staging/xillybus/xillybus_core.c 
> b/drivers/staging/xillybus/xillybus_core.c
> index 7db6f03..0313139 100644
> --- a/drivers/staging/xillybus/xillybus_core.c
> +++ b/drivers/staging/xillybus/xillybus_core.c
> @@ -112,7 +112,7 @@ static void malformed_message(u32 *buf)
>   msg_bufno = (buf[0] >> 12) & 0x3ff;
>   msg_data = buf[1] & 0xfffffff;
>  
> - pr_warn("xillybus: Malformed message (skipping): "
> + pr_warn("xillybus: Malformed message (skipping):\n"
>   "opcode=%d, channel=%03x, dir=%d, bufno=%03x, data=%07x\n",
>   opcode, msg_channel, msg_dir, msg_bufno, msg_data);
>  }
> @@ -153,14 +153,14 @@ irqreturn_t xillybus_isr(int irq, void *data)
>   for (i = 0; i < buf_size; i += 2)
>   if (((buf[i+1] >> 28) & 0xf) != ep->msg_counter) {
>   malformed_message(&buf[i]);
> - pr_warn("xillybus: Sending a NACK on "
> - "counter %x (instead of %x) on entry %d\n",
> + pr_warn("xillybus: Sending a NACK on\n
> + counter %x (instead of %x) on entry %d\n",
>   ((buf[i+1] >> 28) & 0xf),
>   ep->msg_counter,
>   i/2);
>  
>   if (++ep->failed_messages > 10)
> - pr_err("xillybus: Lost sync with "
> + pr_err("xillybus: Lost sync with\n"
>         "interrupt messages. Stopping.\n");
>   else {
>   ep->ephw->hw_sync_sgl_for_device(
> @@ -283,12 +283,12 @@ irqreturn_t xillybus_isr(int irq, void *data)
>   case XILLYMSG_OPCODE_FATAL_ERROR:
>   ep->fatal_error = 1;
>   wake_up_interruptible(&ep->ep_wait); /* For select() */
> - pr_err("xillybus: FPGA reported a fatal "
> -       "error. This means that the low-level "
> -       "communication with the device has failed. "
> -       "This hardware problem is most likely "
> -       "unrelated to xillybus (neither kernel "
> -       "module nor FPGA core), but reports are "
> + pr_err("xillybus: FPGA reported a fatal\n"
> +       "error. This means that the low-level\n"
> +       "communication with the device has failed.\n"
> +       "This hardware problem is most likely\n"
> +       "unrelated to xillybus (neither kernel\n"
> +       "module nor FPGA core), but reports are\n"
>         "still welcome. All I/O is aborted.\n");
>   break;
>   default:
> @@ -486,7 +486,7 @@ static int xilly_setupchannels(struct xilly_endpoint 
> *ep,
>  
>   if ((channelnum > ep->num_channels) ||
>      ((channelnum == 0) && !is_writebuf)) {
> - pr_err("xillybus: IDT requests channel out "
> + pr_err("xillybus: IDT requests channel out\n"
>         "of range. Aborting.\n");
>   return -ENODEV;
>   }
> @@ -565,8 +565,8 @@ static int xilly_setupchannels(struct xilly_endpoint 
> *ep,
>   */
>   if ((left_of_wr_salami < bytebufsize) &&
>      (left_of_wr_salami > 0)) {
> - pr_err("xillybus: "
> -       "Corrupt buffer allocation "
> + pr_err("xillybus:\n"
> +       "Corrupt buffer allocation\n"
>         "in IDT. Aborting.\n");
>   return -ENODEV;
>   }
> @@ -644,8 +644,8 @@ static int xilly_setupchannels(struct xilly_endpoint 
> *ep,
>   */
>   if ((left_of_rd_salami < bytebufsize) &&
>      (left_of_rd_salami > 0)) {
> - pr_err("xillybus: "
> -       "Corrupt buffer allocation "
> + pr_err("xillybus:\n"
> +       "Corrupt buffer allocation\n"
>         "in IDT. Aborting.\n");
>   return -ENODEV;
>   }
> @@ -706,7 +706,7 @@ static int xilly_setupchannels(struct xilly_endpoint 
> *ep,
>   }
>  
>   if (!msg_buf_done) {
> - pr_err("xillybus: Corrupt IDT: No message buffer. "
> + pr_err("xillybus: Corrupt IDT: No message buffer.\n"
>         "Aborting.\n");
>   return -ENODEV;
>   }
> @@ -714,7 +714,7 @@ static int xilly_setupchannels(struct xilly_endpoint 
> *ep,
>   return 0;
>  
>  memfail:
> - pr_err("xillybus: Failed to allocate write buffer memory. "
> + pr_err("xillybus: Failed to allocate write buffer memory.\n"
>         "Aborting.\n");
>   return -ENOMEM;
>  dmafail:
> @@ -745,7 +745,7 @@ static void xilly_scan_idt(struct xilly_endpoint 
> *endpoint,
>   scan++;
>  
>   if (scan > end_of_idt) {
> - pr_err("xillybus: IDT device name list overflow. "
> + pr_err("xillybus: IDT device name list overflow.\n"
>         "Aborting.\n");
>   idt_handle->chandesc = NULL;
>   return;
> @@ -757,7 +757,7 @@ static void xilly_scan_idt(struct xilly_endpoint 
> *endpoint,
>   if (len & 0x03) {
>   idt_handle->chandesc = NULL;
>  
> - pr_err("xillybus: Corrupt IDT device name list. "
> + pr_err("xillybus: Corrupt IDT device name list.\n"
>         "Aborting.\n");
>   }
>  
> @@ -803,7 +803,7 @@ static int xilly_obtain_idt(struct xilly_endpoint 
> *endpoint)
>   DMA_FROM_DEVICE);
>  
>   if (channel->wr_buffers[0]->end_offset != endpoint->idtlen) {
> - pr_err("xillybus: IDT length mismatch (%d != %d). "
> + pr_err("xillybus: IDT length mismatch (%d != %d).\n"
>         "Aborting.\n",
>         channel->wr_buffers[0]->end_offset, endpoint->idtlen);
>   rc = -ENODEV;
> @@ -821,8 +821,8 @@ static int xilly_obtain_idt(struct xilly_endpoint 
> *endpoint)
>  
>   /* Check version number. Accept anything below 0x82 for now. */
>   if (*version > 0x82) {
> - pr_err("xillybus: No support for IDT version 0x%02x. "
> -       "Maybe the xillybus driver needs an upgarde. "
> + pr_err("xillybus: No support for IDT version 0x%02x.\n"
> +       "Maybe the xillybus driver needs an upgarde.\n"
>         "Aborting.\n",
>         (int) *version);
>   rc = -ENODEV;
> @@ -1312,8 +1312,8 @@ static int xillybus_myflush(struct xilly_channel 
> *channel, long timeout)
>   channel->rd_wait,
>   (!channel->rd_full),
>   timeout) == 0) {
> - pr_warn("xillybus: "
> - "Timed out while flushing. "
> + pr_warn("xillybus:\n"
> + "Timed out while flushing.\n"
>   "Output data may be lost.\n");
>  
>   rc = -ETIMEDOUT;
> @@ -1354,10 +1354,10 @@ static void xillybus_autoflush(struct work_struct 
> *work)
>   rc = xillybus_myflush(channel, -1);
>  
>   if (rc == -EINTR)
> - pr_warn("xillybus: Autoflush failed because "
> + pr_warn("xillybus: Autoflush failed because\n"
>   "work queue thread got a signal.\n");
>   else if (rc)
> - pr_err("xillybus: Autoflush failed under "
> + pr_err("xillybus: Autoflush failed under\n"
>         "weird circumstances.\n");
>  
>  }
> @@ -1615,7 +1615,7 @@ static int xillybus_open(struct inode *inode, struct 
> file *filp)
>   mutex_unlock(&ep_list_lock);
>  
>   if (!endpoint) {
> - pr_err("xillybus: open() failed to find a device "
> + pr_err("xillybus: open() failed to find a device\n"
>         "for major=%d and minor=%d\n", major, minor);
>   return -ENODEV;
>   }
> @@ -1642,14 +1642,14 @@ static int xillybus_open(struct inode *inode, 
> struct file *filp)
>   if ((filp->f_mode & FMODE_READ) && (filp->f_flags & O_NONBLOCK) &&
>      (channel->wr_synchronous || !channel->wr_allow_partial ||
>       !channel->wr_supports_nonempty)) {
> - pr_err("xillybus: open() failed: "
> + pr_err("xillybus: open() failed:\n"
>         "O_NONBLOCK not allowed for read on this device\n");
>   return -ENODEV;
>   }
>  
>   if ((filp->f_mode & FMODE_WRITE) && (filp->f_flags & O_NONBLOCK) &&
>      (channel->rd_synchronous || !channel->rd_allow_partial)) {
> - pr_err("xillybus: open() failed: "
> + pr_err("xillybus: open() failed:\n"
>         "O_NONBLOCK not allowed for write on this device\n");
>   return -ENODEV;
>   }
> @@ -1765,7 +1765,7 @@ static int xillybus_release(struct inode *inode, 
> struct file *filp)
>   rc = mutex_lock_interruptible(&channel->rd_mutex);
>  
>   if (rc) {
> - pr_warn("xillybus: Failed to close file. "
> + pr_warn("xillybus: Failed to close file.\n"
>   "Hardware left in messy state.\n");
>   return rc;
>   }
> @@ -1791,7 +1791,7 @@ static int xillybus_release(struct inode *inode, 
> struct file *filp)
>   if (filp->f_mode & FMODE_READ) {
>   rc = mutex_lock_interruptible(&channel->wr_mutex);
>   if (rc) {
> - pr_warn("xillybus: Failed to close file. "
> + pr_warn("xillybus: Failed to close file.\n"
>   "Hardware left in messy state.\n");
>   return rc;
>   }
> @@ -1853,9 +1853,9 @@ static int xillybus_release(struct inode *inode, 
> struct file *filp)
>  
>   if (channel->wr_sleepy) {
>   mutex_unlock(&channel->wr_mutex);
> - pr_warn("xillybus: Hardware failed to "
> - "respond to close command, "
> - "therefore left in "
> + pr_warn("xillybus: Hardware failed to\n"
> + "respond to close command,\n"
> + "therefore left in\n"
>   "messy state.\n");
>   return -EINTR;
>   }
> @@ -2057,7 +2057,7 @@ static int xillybus_init_chrdev(struct xilly_endpoint 
> *endpoint,
>         "%s", devname);
>  
>   if (IS_ERR(device)) {
> - pr_warn("xillybus: Failed to create %s "
> + pr_warn("xillybus: Failed to create %s\n"
>   "device. Aborting.\n", devname);
>   goto error3;
>   }
> @@ -2141,7 +2141,7 @@ static int xilly_quiesce(struct xilly_endpoint 
> *endpoint)
>   XILLY_TIMEOUT);
>  
>   if (endpoint->idtlen < 0) {
> - pr_err("xillybus: Failed to quiesce the device on "
> + pr_err("xillybus: Failed to quiesce the device on\n"
>         "exit. Quitting while leaving a mess.\n");
>   return -ENODEV;
>   }
> -- 
> 1.8.1.2
> 
> -- 
> You received this message because you are subscribed to the Google Groups "opw-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to opw-kernel+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.

Patch
diff mbox

diff --git a/drivers/staging/xillybus/xillybus_core.c 
b/drivers/staging/xillybus/xillybus_core.c
index 7db6f03..0313139 100644
--- a/drivers/staging/xillybus/xillybus_core.c
+++ b/drivers/staging/xillybus/xillybus_core.c
@@ -112,7 +112,7 @@  static void malformed_message(u32 *buf)
  msg_bufno = (buf[0] >> 12) & 0x3ff;
  msg_data = buf[1] & 0xfffffff;
 
- pr_warn("xillybus: Malformed message (skipping): "
+ pr_warn("xillybus: Malformed message (skipping):\n"
  "opcode=%d, channel=%03x, dir=%d, bufno=%03x, data=%07x\n",
  opcode, msg_channel, msg_dir, msg_bufno, msg_data);
 }
@@ -153,14 +153,14 @@  irqreturn_t xillybus_isr(int irq, void *data)
  for (i = 0; i < buf_size; i += 2)
  if (((buf[i+1] >> 28) & 0xf) != ep->msg_counter) {
  malformed_message(&buf[i]);
- pr_warn("xillybus: Sending a NACK on "
- "counter %x (instead of %x) on entry %d\n",
+ pr_warn("xillybus: Sending a NACK on\n
+ counter %x (instead of %x) on entry %d\n",
  ((buf[i+1] >> 28) & 0xf),
  ep->msg_counter,
  i/2);
 
  if (++ep->failed_messages > 10)
- pr_err("xillybus: Lost sync with "
+ pr_err("xillybus: Lost sync with\n"
        "interrupt messages. Stopping.\n");
  else {
  ep->ephw->hw_sync_sgl_for_device(
@@ -283,12 +283,12 @@  irqreturn_t xillybus_isr(int irq, void *data)
  case XILLYMSG_OPCODE_FATAL_ERROR:
  ep->fatal_error = 1;
  wake_up_interruptible(&ep->ep_wait); /* For select() */
- pr_err("xillybus: FPGA reported a fatal "
-       "error. This means that the low-level "
-       "communication with the device has failed. "
-       "This hardware problem is most likely "
-       "unrelated to xillybus (neither kernel "
-       "module nor FPGA core), but reports are "
+ pr_err("xillybus: FPGA reported a fatal\n"
+       "error. This means that the low-level\n"
+       "communication with the device has failed.\n"
+       "This hardware problem is most likely\n"
+       "unrelated to xillybus (neither kernel\n"
+       "module nor FPGA core), but reports are\n"
        "still welcome. All I/O is aborted.\n");
  break;
  default:
@@ -486,7 +486,7 @@  static int xilly_setupchannels(struct xilly_endpoint 
*ep,
 
  if ((channelnum > ep->num_channels) ||
     ((channelnum == 0) && !is_writebuf)) {
- pr_err("xillybus: IDT requests channel out "
+ pr_err("xillybus: IDT requests channel out\n"
        "of range. Aborting.\n");
  return -ENODEV;