From: John Keeping Date: Tue, 5 Apr 2016 13:50:31 +0000 (+0100) Subject: UPSTREAM: drm/rockchip: remove redundant statement X-Git-Tag: firefly_0821_release~1144 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2097aa410e0d8541cee7ce0b28bb9ac681722e10;p=firefly-linux-kernel-4.4.55.git UPSTREAM: drm/rockchip: remove redundant statement The call to arm_iommu_detach_device() on the previous line sets dev->archdata.mapping to NULL so this call is always a no-op. Change-Id: I09b41c284c61885fb4b989a64839e96bcc316aa6 Signed-off-by: John Keeping Signed-off-by: Huang, Tao (cherry picked from commit aa1ac27f48de0ed94d5a104e15b5ab62b5deb236) --- diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index e2a935de39bf..86382b7965d5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -823,7 +823,6 @@ static int rockchip_drm_unload(struct drm_device *drm_dev) drm_kms_helper_poll_fini(drm_dev); component_unbind_all(dev, drm_dev); arm_iommu_detach_device(dev); - arm_iommu_release_mapping(dev->archdata.mapping); drm_mode_config_cleanup(drm_dev); drm_dev->dev_private = NULL;