staging: drm/imx: remove unused variables
authorPhilipp Zabel <p.zabel@pengutronix.de>
Fri, 21 Jun 2013 08:57:18 +0000 (10:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Jun 2013 23:01:05 +0000 (16:01 -0700)
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/imx-drm/imx-drm-core.c
drivers/staging/imx-drm/ipuv3-crtc.c

index 8c433fc167c6932c10e63a966f99699d74b94d85..9854a1daf606b9b713c63ec8114da1a163948df2 100644 (file)
@@ -491,7 +491,6 @@ int imx_drm_add_crtc(struct drm_crtc *crtc,
 {
        struct imx_drm_device *imxdrm = __imx_drm_device();
        struct imx_drm_crtc *imx_drm_crtc;
-       const struct drm_crtc_funcs *crtc_funcs;
        int ret;
 
        mutex_lock(&imxdrm->mutex);
@@ -512,8 +511,6 @@ int imx_drm_add_crtc(struct drm_crtc *crtc,
        imx_drm_crtc->cookie.cookie = cookie;
        imx_drm_crtc->cookie.id = id;
 
-       crtc_funcs = imx_drm_helper_funcs->crtc_funcs;
-
        imx_drm_crtc->crtc = crtc;
        imx_drm_crtc->imxdrm = imxdrm;
 
index ff5c63350932b32f7bd05aa277733d0a77cb2b1f..abcdaefce8e027380eff0e0b883e8504c2a545aa 100644 (file)
@@ -22,7 +22,6 @@
 #include <linux/device.h>
 #include <linux/platform_device.h>
 #include <drm/drmP.h>
-#include <drm/drm_fb_helper.h>
 #include <drm/drm_crtc_helper.h>
 #include <linux/fb.h>
 #include <linux/clk.h>
@@ -42,9 +41,6 @@ struct ipu_framebuffer {
 };
 
 struct ipu_crtc {
-       struct drm_fb_helper    fb_helper;
-       struct ipu_framebuffer  ifb;
-       int                     num_crtcs;
        struct device           *dev;
        struct drm_crtc         base;
        struct imx_drm_crtc     *imx_crtc;
@@ -54,7 +50,6 @@ struct ipu_crtc {
        struct dmfc_channel     *dmfc;
        struct ipu_di           *di;
        int                     enabled;
-       struct ipu_priv         *ipu_priv;
        struct drm_pending_vblank_event *page_flip_event;
        struct drm_framebuffer  *newfb;
        int                     irq;