diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2020-02-19 08:39:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-06 08:35:38 +0100 |
| commit | 101f227c24038aed5bd821414fdd9e9a3509484a (patch) | |
| tree | 0628321beaf2d5700bb1782525ac914d7b936a50 | |
| parent | ba08cf452f3493e96793c9fec4ebb45e7101a0c0 (diff) | |
vt: selection, remove 2 local variables from set_selection_kernel
multiplier and mode are not actually needed:
* multiplier is used only in kmalloc_array, so use "use_unicode ? 4 : 1"
directly
* mode is used only to assign a bool in this manner:
if (cond)
x = true;
else
x = false;
So do "x = cond" directly.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200219073951.16151-3-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/vt/selection.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c index 714992693974..6541c09d8bba 100644 --- a/drivers/tty/vt/selection.c +++ b/drivers/tty/vt/selection.c @@ -191,9 +191,9 @@ int set_selection_kernel(struct tiocl_selection *v, struct tty_struct *tty) struct vc_data *vc = vc_cons[fg_console].d; int new_sel_start, new_sel_end, spc; char *bp, *obp; - int i, ps, pe, multiplier; + int i, ps, pe; u32 c; - int mode, ret = 0; + int ret = 0; poke_blanked_console(); @@ -224,11 +224,7 @@ int set_selection_kernel(struct tiocl_selection *v, struct tty_struct *tty) clear_selection(); sel_cons = vc_cons[fg_console].d; } - mode = vt_do_kdgkbmode(fg_console); - if (mode == K_UNICODE) - use_unicode = 1; - else - use_unicode = 0; + use_unicode = vt_do_kdgkbmode(fg_console) == K_UNICODE; switch (v->sel_mode) { @@ -312,8 +308,8 @@ int set_selection_kernel(struct tiocl_selection *v, struct tty_struct *tty) sel_end = new_sel_end; /* Allocate a new buffer before freeing the old one ... */ - multiplier = use_unicode ? 4 : 1; /* chars can take up to 4 bytes */ - bp = kmalloc_array((sel_end - sel_start) / 2 + 1, multiplier, + /* chars can take up to 4 bytes with unicode */ + bp = kmalloc_array((sel_end - sel_start) / 2 + 1, use_unicode ? 4 : 1, GFP_KERNEL); if (!bp) { printk(KERN_WARNING "selection: kmalloc() failed\n"); |