diff options
| author | Russell King <rmk+cubox@arm.linux.org.uk> | 2013-10-30 10:45:56 +0000 |
|---|---|---|
| committer | Russell King <rmk@arm.linux.org.uk> | 2013-10-30 10:45:56 +0000 |
| commit | a4d48f22f0156d5a387c2a38bf877f9d8fa81e7d (patch) | |
| tree | a2f5069c8e2f0a8a884a48b7add48d1222f8a8cf | |
| parent | 673eb696bef3105e49f27a789e3bff3662802d57 (diff) | |
| download | xf86-video-armada-a4d48f22f0156d5a387c2a38bf877f9d8fa81e7d.tar.gz xf86-video-armada-a4d48f22f0156d5a387c2a38bf877f9d8fa81e7d.tar.xz | |
Clean up drmc->drm->fd
In various places, we only dereference drmc->drm once. There's no
point in assigning this to a separate variable just for one access.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| -rw-r--r-- | src/armada_drm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/armada_drm.c b/src/armada_drm.c index 4c89f89..b80a488 100644 --- a/src/armada_drm.c +++ b/src/armada_drm.c @@ -350,9 +350,8 @@ armada_drm_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rot_pixmap, } if (data) { struct armada_crtc_info *drmc = armada_crtc(crtc); - struct armada_drm_info *drm = drmc->drm; - drmModeRmFB(drm->fd, drmc->rotate_fb_id); + drmModeRmFB(drmc->drm->fd, drmc->rotate_fb_id); drmc->rotate_fb_id = 0; drm_armada_bo_put(data); @@ -362,10 +361,10 @@ armada_drm_crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rot_pixmap, static void armada_drm_crtc_destroy(xf86CrtcPtr crtc) { struct armada_crtc_info *drmc = armada_crtc(crtc); - struct armada_drm_info *drm = drmc->drm; if (drmc->cursor_bo) { - drmModeSetCursor(drm->fd, drmc->mode_crtc->crtc_id, 0, 0, 0); + drmModeSetCursor(drmc->drm->fd, drmc->mode_crtc->crtc_id, + 0, 0, 0); drm_armada_bo_put(drmc->cursor_bo); } drmModeFreeCrtc(drmc->mode_crtc); |