Linux 6.9-rc1

[linux-2.6-microblaze.git] / drivers / input / keyboard / spear-keyboard.c

diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
index a50fa99..557d00a 100644 (file)
--- a/drivers/input/keyboard/spear-keyboard.c
+++ b/drivers/input/keyboard/spear-keyboard.c
@@ -272,14 +272,12 @@ static int spear_kbd_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int spear_kbd_remove(struct platform_device *pdev)
+static void spear_kbd_remove(struct platform_device *pdev)
 {
        struct spear_kbd *kbd = platform_get_drvdata(pdev);
 
        input_unregister_device(kbd->input);
        clk_unprepare(kbd->clk);
-
-       return 0;
 }
 
 static int spear_kbd_suspend(struct device *dev)
@@ -375,7 +373,7 @@ MODULE_DEVICE_TABLE(of, spear_kbd_id_table);
 
 static struct platform_driver spear_kbd_driver = {
        .probe          = spear_kbd_probe,
-       .remove         = spear_kbd_remove,
+       .remove_new     = spear_kbd_remove,
        .driver         = {
                .name   = "keyboard",
                .pm     = pm_sleep_ptr(&spear_kbd_pm_ops),