2022-04-12 20:11:06

by Geert Uytterhoeven

[permalink] [raw]
Subject: [PATCH/RFC] Input: serio - decouple libps2 from i8042

As of commit 4097461897df9104 ("Input: i8042 - break load dependency
between atkbd/psmouse and i8042"), the libps2 driver no longer uses any
functionality from the i8042 driver. Hence the meat of commit
fed94549edc90b15 ("Input: libps2 - fix dependancy on i8042") can be
reverted.

Remove the obsolete inclusion of <linux/i8042.h> from the libps2 driver.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
Does this actually work?
---
drivers/input/serio/Kconfig | 1 -
drivers/input/serio/libps2.c | 1 -
2 files changed, 2 deletions(-)

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index f39b7b3f79421538..2d875f4d95f41116 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -177,7 +177,6 @@ config SERIO_SGI_IOC3

config SERIO_LIBPS2
tristate "PS/2 driver library"
- depends on SERIO_I8042 || SERIO_I8042=n
help
Say Y here if you are using a driver for device connected
to a PS/2 port, such as PS/2 mouse or standard AT keyboard.
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c
index 250e213cc80c68be..f5980eb980868dc7 100644
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
@@ -13,7 +13,6 @@
#include <linux/interrupt.h>
#include <linux/input.h>
#include <linux/serio.h>
-#include <linux/i8042.h>
#include <linux/libps2.h>

#define DRIVER_DESC "PS/2 driver library"
--
2.25.1