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-pl010.c | |
| parent | fd749fe4bcb00ad80d9eece709f804bb4ac6bf1e (diff) | |
| parent | 860660fd829e64d4deb255fac9d73ab84a1440c3 (diff) | |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'drivers/tty/serial/amba-pl010.c')
| -rw-r--r-- | drivers/tty/serial/amba-pl010.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/tty/serial/amba-pl010.c b/drivers/tty/serial/amba-pl010.c index 3284f34e9dfe..3f96edfe569c 100644 --- a/drivers/tty/serial/amba-pl010.c +++ b/drivers/tty/serial/amba-pl010.c @@ -754,7 +754,7 @@ static int pl010_probe(struct amba_device *dev, const struct amba_id *id) return ret; } -static int pl010_remove(struct amba_device *dev) +static void pl010_remove(struct amba_device *dev) { struct uart_amba_port *uap = amba_get_drvdata(dev); int i; @@ -770,8 +770,6 @@ static int pl010_remove(struct amba_device *dev) if (!busy) uart_unregister_driver(&amba_reg); - - return 0; } #ifdef CONFIG_PM_SLEEP |