5.10-stable review patch. If anyone has any objections, please let me know.
------------------
From: Greg Kroah-Hartman gregkh@linuxfoundation.org
This reverts commit 0096d223f78cb48db1ae8ae9fd56d702896ba8ae which is commit 150e792dee9ca8416f3d375e48f2f4d7f701fc6b upstream.
It breaks the build and shouldn't be here, it was applied to make a follow-up one apply easier.
Reported-by: Dominique Martinet asmadeus@codewreck.org Link: https://lore.kernel.org/r/Zs6hwNxk7QkCe7AW@codewreck.org Cc: Uwe Kleine-König u.kleine-koenig@pengutronix.de Link: https://lore.kernel.org/r/20230920125829.1478827-37-u.kleine-koenig@pengutro... Cc: Dmitry Torokhov dmitry.torokhov@gmail.com Cc: Sasha Levin sashal@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/input/serio/ioc3kbd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
--- a/drivers/input/serio/ioc3kbd.c +++ b/drivers/input/serio/ioc3kbd.c @@ -190,7 +190,7 @@ static int ioc3kbd_probe(struct platform return 0; }
-static void ioc3kbd_remove(struct platform_device *pdev) +static int ioc3kbd_remove(struct platform_device *pdev) { struct ioc3kbd_data *d = platform_get_drvdata(pdev);
@@ -198,6 +198,8 @@ static void ioc3kbd_remove(struct platfo
serio_unregister_port(d->kbd); serio_unregister_port(d->aux); + + return 0; }
static const struct platform_device_id ioc3kbd_id_table[] = { @@ -208,7 +210,7 @@ MODULE_DEVICE_TABLE(platform, ioc3kbd_id
static struct platform_driver ioc3kbd_driver = { .probe = ioc3kbd_probe, - .remove_new = ioc3kbd_remove, + .remove = ioc3kbd_remove, .id_table = ioc3kbd_id_table, .driver = { .name = "ioc3-kbd",