Skip to content

Commit

Permalink
Revert "Input: ioc3kbd - convert to platform remove callback returnin…
Browse files Browse the repository at this point in the history
…g void"

This reverts commit 0096d22 which is
commit 150e792 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 <dominique.martinet@atmark-techno.com>
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@pengutronix.de
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
gregkh committed Sep 4, 2024
1 parent 777d9c2 commit f2b6cd1
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/input/serio/ioc3kbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,16 @@ static int ioc3kbd_probe(struct platform_device *pdev)
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);

free_irq(d->irq, d);

serio_unregister_port(d->kbd);
serio_unregister_port(d->aux);

return 0;
}

static const struct platform_device_id ioc3kbd_id_table[] = {
Expand All @@ -208,7 +210,7 @@ MODULE_DEVICE_TABLE(platform, ioc3kbd_id_table);

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",
Expand Down

0 comments on commit f2b6cd1

Please sign in to comment.