Remove unused variables

diff --git a/Android.mk b/Android.mk
index f9fd39f..e94ea86 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -89,7 +89,7 @@ endif
 
 ifneq ($(filter pipe, $(DRM_GPU_DRIVERS)),)
 LOCAL_SRC_FILES += gralloc_drm_pipe.c
-LOCAL_CFLAGS += -DENABLE_PIPE
+LOCAL_CFLAGS += -DENABLE_PIPE -DHAVE_FUNC_ATTRIBUTE_UNUSED
 LOCAL_C_INCLUDES += \
        external/mesa/include \
        external/mesa/src \

diff --git a/gralloc.c b/gralloc.c
index dd85ae7..a3fb9fa 100644 (file)
--- a/gralloc.c
+++ b/gralloc.c
@@ -199,7 +199,6 @@ static int drm_mod_lock_ycbcr(const gralloc_module_t *mod, buffer_handle_t bhand
 
 static int drm_mod_unlock(const gralloc_module_t *mod, buffer_handle_t handle)
 {
-       struct drm_module_t *dmod = (struct drm_module_t *) mod;
        struct gralloc_drm_bo_t *bo;
        int err = 0;
 
@@ -229,7 +228,6 @@ static int drm_mod_close_gpu0(struct hw_device_t *dev)
 
 static int drm_mod_free_gpu0(alloc_device_t *dev, buffer_handle_t handle)
 {
-       struct drm_module_t *dmod = (struct drm_module_t *) dev->common.module;
        struct gralloc_drm_bo_t *bo;
        int err = 0;
 
@@ -254,7 +252,7 @@ static int drm_mod_alloc_gpu0(alloc_device_t *dev,
 {
        struct drm_module_t *dmod = (struct drm_module_t *) dev->common.module;
        struct gralloc_drm_bo_t *bo;
-       int size, bpp, err = 0;
+       int bpp, err = 0;
 
        bpp = gralloc_drm_get_bpp(format);
        if (!bpp)
@@ -332,7 +330,6 @@ static int drm_mod_set_swap_interval_fb0(struct framebuffer_device_t *fb,
 static int drm_mod_post_fb0(struct framebuffer_device_t *fb,
                buffer_handle_t handle)
 {
-       struct drm_module_t *dmod = (struct drm_module_t *) fb->common.module;
        struct gralloc_drm_bo_t *bo;
 
        bo = gralloc_drm_bo_from_handle(handle);

diff --git a/gralloc_drm_kms.c b/gralloc_drm_kms.c
index e68cf8d..e10adb5 100644 (file)
--- a/gralloc_drm_kms.c
+++ b/gralloc_drm_kms.c
@@ -721,7 +721,6 @@ static void drm_kms_init_features(struct gralloc_drm_t *drm)
        }
        else if (drm->swap_mode == DRM_SWAP_COPY) {
                struct gralloc_drm_bo_t *front;
-               int stride;
 
                /* create the real front buffer */
                front = gralloc_drm_bo_create(drm,
@@ -887,8 +886,6 @@ static drmModeModeInfoPtr find_mode(drmModeConnectorPtr connector, int *bpp, drm
        int bestfit = 0;
 
        if (property_get("debug.drm.mode", value, NULL)) {
-               char *p = value, *end;
-
                /* parse <xres>x<yres>[@<bpp>] */
                if (sscanf(value, "%dx%d@%d", &xres, &yres, bpp) != 3) {
                        *bpp = 0;
@@ -901,7 +898,6 @@ static drmModeModeInfoPtr find_mode(drmModeConnectorPtr connector, int *bpp, drm
                                        xres, yres, *bpp);
                }
        } else if (property_get("debug.drm.mode.force", value, NULL)) {
-               char *p = value, *end;
                *bpp = 0;
 
                /* parse <xres>x<yres>[@<refreshrate>] */
@@ -1191,7 +1187,6 @@ static int init_connectors(struct gralloc_drm_t *drm)
 static void *extcon_observer(void *data)
 {
        char uevent_desc[2048];
-       drmModeConnectorPtr hdmi;
        struct gralloc_drm_t *drm =
                (struct gralloc_drm_t *) data;
        struct uevent event;

diff --git a/gralloc_drm_nouveau.c b/gralloc_drm_nouveau.c
index f3ecfd6..5f0e192 100644 (file)
--- a/gralloc_drm_nouveau.c
+++ b/gralloc_drm_nouveau.c
@@ -301,8 +301,6 @@ static void nouveau_unmap(struct gralloc_drm_drv_t *drv,
 static void nouveau_init_kms_features(struct gralloc_drm_drv_t *drv,
                struct gralloc_drm_t *drm)
 {
-       struct nouveau_info *info = (struct nouveau_info *) drv;
-
        switch (drm->primary->fb_format) {
        case HAL_PIXEL_FORMAT_BGRA_8888:
        case HAL_PIXEL_FORMAT_RGB_565:

diff --git a/gralloc_drm_pipe.c b/gralloc_drm_pipe.c
index 56ecd12..5728015 100644 (file)
--- a/gralloc_drm_pipe.c
+++ b/gralloc_drm_pipe.c
@@ -339,8 +339,6 @@ static void pipe_blit(struct gralloc_drm_drv_t *drv,
 
 static void pipe_init_kms_features(struct gralloc_drm_drv_t *drv, struct gralloc_drm_t *drm)
 {
-       struct pipe_manager *pm = (struct pipe_manager *) drv;
-
        switch (drm->primary->fb_format) {
        case HAL_PIXEL_FORMAT_BGRA_8888:
        case HAL_PIXEL_FORMAT_RGB_565: