aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-05-18 12:07:33 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-05-18 13:16:24 -0400
commitc6740c9c9e914742fd2ec159142c40701f7df966 (patch)
treeafd064feb4f3c0348676d8596b95e6a09293142f
parentde4ae068ebf599f46ddfc5f8541a302226230267 (diff)
drm: remove unused dev variables
After drm_gem_object_lookup() was changed along with all its callers, we have several drivers that have unused variables: drm/armada/armada_crtc.c: In function 'armada_drm_crtc_cursor_set': drm/armada/armada_crtc.c:900:21: error: unused variable 'dev' [-Werror=unused-variable] drm/nouveau/nouveau_gem.c: In function 'validate_init': drm/nouveau/nouveau_gem.c:371:21: error: unused variable 'dev' [-Werror=unused-variable] drm/nouveau/nv50_display.c: In function 'nv50_crtc_cursor_set': drm/nouveau/nv50_display.c:1308:21: error: unused variable 'dev' [-Werror=unused-variable] drm/radeon/radeon_cs.c: In function 'radeon_cs_parser_relocs': drm/radeon/radeon_cs.c:77:21: error: unused variable 'ddev' [-Werror=unused-variable] This fixes all the instances I found with ARM randconfig builds so far. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: a8ad0bd84f98 ("drm: Remove unused drm_device from drm_gem_object_lookup()") Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1463587653-3035181-6-git-send-email-arnd@arndb.de
-rw-r--r--drivers/gpu/drm/armada/armada_crtc.c1
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_gem.c1
-rw-r--r--drivers/gpu/drm/nouveau/nv50_display.c1
-rw-r--r--drivers/gpu/drm/radeon/radeon_cs.c1
4 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index a9b7e0f36513..3130aa8bcdd0 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -897,7 +897,6 @@ static void cursor_update(void *data)
897static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc, 897static int armada_drm_crtc_cursor_set(struct drm_crtc *crtc,
898 struct drm_file *file, uint32_t handle, uint32_t w, uint32_t h) 898 struct drm_file *file, uint32_t handle, uint32_t w, uint32_t h)
899{ 899{
900 struct drm_device *dev = crtc->dev;
901 struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc); 900 struct armada_crtc *dcrtc = drm_to_armada_crtc(crtc);
902 struct armada_gem_object *obj = NULL; 901 struct armada_gem_object *obj = NULL;
903 int ret; 902 int ret;
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
index 445a9e2fb91a..a030e218adf7 100644
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
@@ -368,7 +368,6 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
368 int nr_buffers, struct validate_op *op) 368 int nr_buffers, struct validate_op *op)
369{ 369{
370 struct nouveau_cli *cli = nouveau_cli(file_priv); 370 struct nouveau_cli *cli = nouveau_cli(file_priv);
371 struct drm_device *dev = chan->drm->dev;
372 int trycnt = 0; 371 int trycnt = 0;
373 int ret, i; 372 int ret, i;
374 struct nouveau_bo *res_bo = NULL; 373 struct nouveau_bo *res_bo = NULL;
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 47761a92926e..ec2e67eb8980 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -1305,7 +1305,6 @@ nv50_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,
1305 uint32_t handle, uint32_t width, uint32_t height) 1305 uint32_t handle, uint32_t width, uint32_t height)
1306{ 1306{
1307 struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc); 1307 struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
1308 struct drm_device *dev = crtc->dev;
1309 struct drm_gem_object *gem = NULL; 1308 struct drm_gem_object *gem = NULL;
1310 struct nouveau_bo *nvbo = NULL; 1309 struct nouveau_bo *nvbo = NULL;
1311 int ret = 0; 1310 int ret = 0;
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
index 271652963fa1..510ea371dacc 100644
--- a/drivers/gpu/drm/radeon/radeon_cs.c
+++ b/drivers/gpu/drm/radeon/radeon_cs.c
@@ -74,7 +74,6 @@ static void radeon_cs_buckets_get_list(struct radeon_cs_buckets *b,
74 74
75static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) 75static int radeon_cs_parser_relocs(struct radeon_cs_parser *p)
76{ 76{
77 struct drm_device *ddev = p->rdev->ddev;
78 struct radeon_cs_chunk *chunk; 77 struct radeon_cs_chunk *chunk;
79 struct radeon_cs_buckets buckets; 78 struct radeon_cs_buckets buckets;
80 unsigned i; 79 unsigned i;