summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2021-02-22 16:09:55 +0300
committerRussell King <rmk+kernel@armlinux.org.uk>2021-02-22 16:09:55 +0300
commit90e53c5e09251edb2cee367f6cb472e4bac121f2 (patch)
tree797296eb8ef5de54a6ec919c0c1f7e1940262c4e /drivers/video
parentfd749fe4bcb00ad80d9eece709f804bb4ac6bf1e (diff)
parent860660fd829e64d4deb255fac9d73ab84a1440c3 (diff)
downloadlinux-90e53c5e09251edb2cee367f6cb472e4bac121f2.tar.xz
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/amba-clcd.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c
index b7682de412d8..33595cc4778e 100644
--- a/drivers/video/fbdev/amba-clcd.c
+++ b/drivers/video/fbdev/amba-clcd.c
@@ -925,7 +925,7 @@ static int clcdfb_probe(struct amba_device *dev, const struct amba_id *id)
return ret;
}
-static int clcdfb_remove(struct amba_device *dev)
+static void clcdfb_remove(struct amba_device *dev)
{
struct clcd_fb *fb = amba_get_drvdata(dev);
@@ -942,8 +942,6 @@ static int clcdfb_remove(struct amba_device *dev)
kfree(fb);
amba_release_regions(dev);
-
- return 0;
}
static const struct amba_id clcdfb_id_table[] = {