diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-22 13:09:55 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-22 13:09:55 +0000 |
| commit | 90e53c5e09251edb2cee367f6cb472e4bac121f2 (patch) | |
| tree | 797296eb8ef5de54a6ec919c0c1f7e1940262c4e /drivers/input | |
| parent | ARM: 9065/1: OABI compat: fix build when EPOLL is not enabled (diff) | |
| parent | ARM: 9055/1: mailbox: arm_mhuv2: make remove callback return void (diff) | |
| download | linux-dev-90e53c5e09251edb2cee367f6cb472e4bac121f2.tar.xz linux-dev-90e53c5e09251edb2cee367f6cb472e4bac121f2.zip | |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/serio/ambakmi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c index ecdeca147ed7..4408245b61d2 100644 --- a/drivers/input/serio/ambakmi.c +++ b/drivers/input/serio/ambakmi.c @@ -159,7 +159,7 @@ static int amba_kmi_probe(struct amba_device *dev, return ret; } -static int amba_kmi_remove(struct amba_device *dev) +static void amba_kmi_remove(struct amba_device *dev) { struct amba_kmi_port *kmi = amba_get_drvdata(dev); @@ -168,7 +168,6 @@ static int amba_kmi_remove(struct amba_device *dev) iounmap(kmi->base); kfree(kmi); amba_release_regions(dev); - return 0; } static int __maybe_unused amba_kmi_resume(struct device *dev) |