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/gpu/drm/pl111 | |
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/gpu/drm/pl111')
-rw-r--r-- | drivers/gpu/drm/pl111/pl111_drv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 40e6708fbbe2..1fb5eacefd2d 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -320,7 +320,7 @@ dev_put: return ret; } -static int pl111_amba_remove(struct amba_device *amba_dev) +static void pl111_amba_remove(struct amba_device *amba_dev) { struct device *dev = &amba_dev->dev; struct drm_device *drm = amba_get_drvdata(amba_dev); @@ -331,8 +331,6 @@ static int pl111_amba_remove(struct amba_device *amba_dev) drm_panel_bridge_remove(priv->bridge); drm_dev_put(drm); of_reserved_mem_device_release(dev); - - return 0; } /* |