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/tty/serial/amba-pl011.c | |
parent | fd749fe4bcb00ad80d9eece709f804bb4ac6bf1e (diff) | |
parent | 860660fd829e64d4deb255fac9d73ab84a1440c3 (diff) |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'drivers/tty/serial/amba-pl011.c')
-rw-r--r-- | drivers/tty/serial/amba-pl011.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index c255476cce28..4ead0c9048a8 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -2679,13 +2679,12 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) return pl011_register_port(uap); } -static int pl011_remove(struct amba_device *dev) +static void pl011_remove(struct amba_device *dev) { struct uart_amba_port *uap = amba_get_drvdata(dev); uart_remove_one_port(&amba_reg, &uap->port); pl011_unregister_port(uap); - return 0; } #ifdef CONFIG_PM_SLEEP |