hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drivers/input: eliminate INPUT_COMPAT_TEST macro 

INPUT_COMPAT_TEST became much simpler after commit f4056b5284
("input: redefine INPUT_COMPAT_TEST as in_compat_syscall()") so we can
cleanly eliminate it altogether.

Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Andy Lutomirski <luto@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andrew Morton 2016-03-25 14:20:47 -07:00 committed by Linus Torvalds
parent bb29902a75
commit b8b4ead11e
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/input/input-compat.c
View File

@ -17,7 +17,7 @@
int input_event_from_user(const char __user *buffer, int input_event_from_user(const char __user *buffer,
struct input_event *event) struct input_event *event)
{ {
if (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) { if (in_compat_syscall() && !COMPAT_USE_64BIT_TIME) {
struct input_event_compat compat_event; struct input_event_compat compat_event;
if (copy_from_user(&compat_event, buffer, if (copy_from_user(&compat_event, buffer,
@ -41,7 +41,7 @@ int input_event_from_user(const char __user *buffer,
int input_event_to_user(char __user *buffer, int input_event_to_user(char __user *buffer,
const struct input_event *event) const struct input_event *event)
{ {
if (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) { if (in_compat_syscall() && !COMPAT_USE_64BIT_TIME) {
struct input_event_compat compat_event; struct input_event_compat compat_event;
compat_event.time.tv_sec = event->time.tv_sec; compat_event.time.tv_sec = event->time.tv_sec;
@ -65,7 +65,7 @@ int input_event_to_user(char __user *buffer,
int input_ff_effect_from_user(const char __user *buffer, size_t size, int input_ff_effect_from_user(const char __user *buffer, size_t size,
struct ff_effect *effect) struct ff_effect *effect)
{ {
if (INPUT_COMPAT_TEST) { if (in_compat_syscall()) {
struct ff_effect_compat *compat_effect; struct ff_effect_compat *compat_effect;
if (size != sizeof(struct ff_effect_compat)) if (size != sizeof(struct ff_effect_compat))

4
drivers/input/input-compat.h
View File

@ -17,8 +17,6 @@
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
#define INPUT_COMPAT_TEST in_compat_syscall()
struct input_event_compat { struct input_event_compat {
struct compat_timeval time; struct compat_timeval time;
__u16 type; __u16 type;
@ -57,7 +55,7 @@ struct ff_effect_compat {
static inline size_t input_event_size(void) static inline size_t input_event_size(void)
{ {
return (INPUT_COMPAT_TEST && !COMPAT_USE_64BIT_TIME) ? return (in_compat_syscall() && !COMPAT_USE_64BIT_TIME) ?
sizeof(struct input_event_compat) : sizeof(struct input_event); sizeof(struct input_event_compat) : sizeof(struct input_event);
} }

2
drivers/input/input.c
View File

@ -1015,7 +1015,7 @@ static int input_bits_to_string(char *buf, int buf_size,
{ {
int len = 0; int len = 0;
if (INPUT_COMPAT_TEST) { if (in_compat_syscall()) {
u32 dword = bits >> 32; u32 dword = bits >> 32;
if (dword || !skip_empty) if (dword || !skip_empty)
len += snprintf(buf, buf_size, "%x ", dword); len += snprintf(buf, buf_size, "%x ", dword);

4
drivers/input/misc/uinput.c
View File

@ -664,7 +664,7 @@ struct uinput_ff_upload_compat {
static int uinput_ff_upload_to_user(char __user *buffer, static int uinput_ff_upload_to_user(char __user *buffer,
const struct uinput_ff_upload *ff_up) const struct uinput_ff_upload *ff_up)
{ {
if (INPUT_COMPAT_TEST) { if (in_compat_syscall()) {
struct uinput_ff_upload_compat ff_up_compat; struct uinput_ff_upload_compat ff_up_compat;
ff_up_compat.request_id = ff_up->request_id; ff_up_compat.request_id = ff_up->request_id;
@ -695,7 +695,7 @@ static int uinput_ff_upload_to_user(char __user *buffer,
static int uinput_ff_upload_from_user(const char __user *buffer, static int uinput_ff_upload_from_user(const char __user *buffer,
struct uinput_ff_upload *ff_up) struct uinput_ff_upload *ff_up)
{ {
if (INPUT_COMPAT_TEST) { if (in_compat_syscall()) {
struct uinput_ff_upload_compat ff_up_compat; struct uinput_ff_upload_compat ff_up_compat;
if (copy_from_user(&ff_up_compat, buffer, if (copy_from_user(&ff_up_compat, buffer,