Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20219
Modified Files:
keyboard.c vt_ioctl.c
Log Message:
White space syncing to linus tree.
Index: keyboard.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/keyboard.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- keyboard.c 5 Apr 2005 17:54:59 -0000 1.16
+++ keyboard.c 5 Apr 2005 18:21:53 -0000 1.17
@@ -976,9 +976,8 @@
}
#endif
-static void kbd_rawcode(struct vt_struct *vt, unsigned char data)
+static void kbd_rawcode(struct vc_data *vc, unsigned char data)
{
- struct vc_data *vc = vt->fg_console;
if (vc->kbd_table.kbdmode == VC_RAW)
put_queue(vc, data);
}
@@ -1117,7 +1116,7 @@
if (!vt)
return;
if (event_type == EV_MSC && event_code == MSC_RAW && HW_RAW(handle->dev))
- kbd_rawcode(vt, value);
+ kbd_rawcode(vt->fg_console, value);
if (event_type == EV_KEY)
kbd_keycode(vt, event_code, value, HW_RAW(handle->dev));
tasklet_schedule(&keyboard_tasklet);
@@ -1167,7 +1166,7 @@
* have one.
*/
if (i != BTN_MISC) {
- list_for_each_entry (vt, &vt_list, node) {
+ list_for_each_entry(vt, &vt_list, node) {
if (!vt->keyboard) {
vt->keyboard = handle;
handle->private = vt;
Index: vt_ioctl.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/char/vt_ioctl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- vt_ioctl.c 5 Apr 2005 17:24:29 -0000 1.11
+++ vt_ioctl.c 5 Apr 2005 18:21:53 -0000 1.12
@@ -349,17 +349,16 @@
goto out;
c = (font.width+7)/8 * 32 * font.charcount;
-
+
if (op->data && font.charcount > op->charcount)
rc = -ENOSPC;
if (!(op->flags & KD_FONT_FLAG_OLD)) {
- if (font.width > op->width || font.height > op->height)
+ if (font.width > op->width || font.height > op->height)
rc = -ENOSPC;
} else {
if (font.width != 8)
rc = -EIO;
- else if ((op->height && font.height > op->height) ||
- font.height > 32)
+ else if ((op->height && font.height > op->height) || font.height > 32)
rc = -ENOSPC;
}
if (rc)
@@ -393,7 +392,7 @@
int h, i;
u8 __user *charmap = op->data;
u8 tmp;
-
+
/* If from KDFONTOP ioctl, don't allow things which can be done in userland,
so that we can get rid of this soon */
if (!(op->flags & KD_FONT_FLAG_OLD))
@@ -406,7 +405,7 @@
goto nonzero;
}
return -EINVAL;
- nonzero:
+nonzero:
op->height = h;
}
if (op->width <= 0 || op->width > 32 || op->height > 32)
@@ -547,7 +546,7 @@
if (copy_from_user(&tmp, user_ud, sizeof tmp))
return -EFAULT;
if (tmp.entries)
- if (!access_ok(VERIFY_WRITE, tmp.entries,
+ if (!access_ok(VERIFY_WRITE, tmp.entries,
tmp.entry_ct*sizeof(struct unipair)))
return -EFAULT;
switch (cmd) {
@@ -778,8 +777,8 @@
int vt_ioctl(struct tty_struct *tty, struct file * file,
unsigned int cmd, unsigned long arg)
{
- struct vc_data *vc = (struct vc_data *)tty->driver_data;
- void __user *up = (void __user *)arg;
+ struct vc_data *vc = (struct vc_data *) tty->driver_data;
+ void __user *up = (void __user *) arg;
struct console_font_op op; /* used in multiple places */
unsigned char ucval;
int i, perm;
@@ -877,9 +876,9 @@
* currently, setting the mode from KD_TEXT to KD_GRAPHICS
* doesn't do a whole lot. i'm not sure if it should do any
* restoration of modes or what...
- *
- * XXX It should at least call into the driver, fbdev's definitely
- * need to restore their engine state. --BenH
+ *
+ * XXX It should at least call into the driver, fbdev's definitely
+ * need to restore their engine state. --BenH
*/
if (!perm)
return -EPERM;
@@ -971,7 +970,7 @@
case KDGKBMETA:
ucval = (get_kbd_mode(&vc->kbd_table, VC_META) ? K_ESCPREFIX : K_METABIT);
setint:
- return put_user(ucval, (int __user *)arg);
+ return put_user(ucval, (int __user *) arg);
case KDGETKEYCODE:
case KDSETKEYCODE:
@@ -1079,7 +1078,7 @@
vc->vt_mode.frsig = 0;
vc->vt_pid = current->pid;
/* no switch is required -- sa...@sh... */
- vc->vt_newvt = -1;
+ vc->vt_newvt = -1;
release_console_sem();
return 0;
}
@@ -1209,7 +1208,7 @@
struct vc_data *tmp = find_vc(vc->vt_newvt);
acquire_console_sem();
- if (!tmp) {
+ if (!tmp) {
tmp = vc_allocate(vc->vt_newvt);
if (!tmp) {
i = vc->vt_newvt;
|
