[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1339605595-27368-1-git-send-email-yungmann.chris@gmail.com>
Date: Wed, 13 Jun 2012 12:39:55 -0400
From: Chris Yungmann <yungmann.chris@...il.com>
To: samuel.thibault@...-lyon.org
Cc: w.d.hubbs@...il.com, chris@...-brannons.com, kirk@...ille.uwo.ca,
gregkh@...uxfoundation.org, speakup@...ille.uwo.ca,
linux-kernel@...r.kernel.org, kernelnewbies@...nelnewbies.org,
Chris Yungmann <yungmann.chris@...il.com>
Subject: [PATCH][RESEND] staging: speakup: fixed checkpatch and sparse warnings in selection.c
Signed-off-by: Chris Yungmann <yungmann.chris@...il.com>
---
drivers/staging/speakup/selection.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/speakup/selection.c b/drivers/staging/speakup/selection.c
index fe1f405..0612df0 100644
--- a/drivers/staging/speakup/selection.c
+++ b/drivers/staging/speakup/selection.c
@@ -68,7 +68,7 @@ int speakup_set_selection(struct tty_struct *tty)
if (spk_sel_cons != vc_cons[fg_console].d) {
speakup_clear_selection();
spk_sel_cons = vc_cons[fg_console].d;
- printk(KERN_WARNING
+ dev_warn(tty->dev,
"Selection: mark console not the same as cut\n");
return -EINVAL;
}
@@ -95,7 +95,7 @@ int speakup_set_selection(struct tty_struct *tty)
/* Allocate a new buffer before freeing the old one ... */
bp = kmalloc((sel_end-sel_start)/2+1, GFP_ATOMIC);
if (!bp) {
- printk(KERN_WARNING "selection: kmalloc() failed\n");
+ dev_warn(tty->dev, "selection: kmalloc() failed\n");
speakup_clear_selection();
return -ENOMEM;
}
@@ -141,7 +141,7 @@ int speakup_paste_selection(struct tty_struct *tty)
count = sel_buffer_lth - pasted;
count = min_t(int, count, tty->receive_room);
tty->ldisc->ops->receive_buf(tty, sel_buffer + pasted,
- 0, count);
+ NULL, count);
pasted += count;
}
remove_wait_queue(&vc->paste_wait, &wait);
--
1.7.10
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists