diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2012-10-18 12:13:08 +0100 |
|---|---|---|
| committer | Russell King <rmk@arm.linux.org.uk> | 2012-10-20 22:04:07 +0100 |
| commit | 3031816ea1347f2c72e596e71b18433650dea3d8 (patch) | |
| tree | 0ba7afe8b20ba2c0a1bd0e23f7e834512fa1c196 | |
| parent | cd2a540b2af83f057fce5a2f6ea64dd4f1d91ffb (diff) | |
Fix a whole pile of compiler warnings
| -rwxr-xr-x | Makefile | 6 | ||||
| -rw-r--r-- | vmeta_lib.c | 13 |
2 files changed, 8 insertions, 11 deletions
@@ -11,8 +11,8 @@ endif SRC_DIR := . -CFLAGS += $(VMETA_DEF) \ - -I${SRC_DIR}/include \ +CFLAGS += $(VMETA_DEF) -O2 -g -Wall -D_GNU_SOURCE + vmeta_lib_src=${SRC_DIR}/vmeta_lib.c \ @@ -22,7 +22,7 @@ vmeta_lib_obj=${vmeta_lib_src:.c=.o} uninstall-host uninstall-target .c.o: - ${CC} -fPIC -o $@ -c $< + $(CC) $(CFLAGS) -fPIC -o $@ -c $< all: compile install-host install-target diff --git a/vmeta_lib.c b/vmeta_lib.c index fe561e5..6190f92 100644 --- a/vmeta_lib.c +++ b/vmeta_lib.c @@ -269,6 +269,8 @@ UNSG32 vdec_os_api_flush_cache(UNSG32 vaddr, UNSG32 size, enum dma_data_directio { if (0 < size) { switch (direction) { + case DMA_NONE: + break; case DMA_FROM_DEVICE: bmm_flush_cache_range((void *)vaddr, size, BMM_DMA_FROM_DEVICE); break; @@ -281,6 +283,8 @@ UNSG32 vdec_os_api_flush_cache(UNSG32 vaddr, UNSG32 size, enum dma_data_directio } } else { switch (direction) { + case DMA_NONE: + break; case DMA_FROM_DEVICE: bmm_flush_cache((void *)vaddr, BMM_DMA_FROM_DEVICE); break; @@ -402,7 +406,6 @@ SIGN32 vdec_os_driver_init(void) { void *addr; int ret = 0; - int rv; #if VMETA_LOG_ON FILE *fp_log; @@ -615,7 +618,6 @@ vdec_os_driver_cb_t *vdec_driver_get_cb(void) SIGN32 vdec_os_api_get_hw_obj_addr(UNSG32* vaddr,UNSG32 size) { UNSG32 io_mem_size; - UNSG32 io_mem_addr; UNSG32 ret = VDEC_OS_DRIVER_OK; void *addr; @@ -697,7 +699,6 @@ get_hw_context_fail: SIGN32 vdec_os_api_get_ks(kernel_share** pp_ks) { UNSG32 io_mem_size; - UNSG32 io_mem_addr; void *addr; UNSG32 ret = VDEC_OS_DRIVER_OK; @@ -750,7 +751,6 @@ SIGN32 vdec_os_api_force_ini(void) { kernel_share *p_ks; vdec_os_driver_cb_t *p_cb = vdec_driver_get_cb(); - int rv; if(p_cb->kernel_share_va == NULL) { @@ -828,7 +828,6 @@ static void *vmeta_thread_monitor(void *_data) { struct monitor_data *pmd = _data; kernel_share *p_ks; - unsigned int *ret; vdec_os_driver_cb_t *p_cb = vdec_driver_get_cb(); pthread_attr_t pat; int detach_attr; @@ -1040,9 +1039,7 @@ SIGN32 vdec_os_api_lock(SIGN32 user_id, long to_ms) { vdec_os_driver_cb_t *p_cb = vdec_driver_get_cb(); kernel_share* p_ks; - struct timespec ts; SIGN32 ret; - SIGN32 sem_val; if(p_cb == NULL) { dbg_printf(VDEC_DEBUG_ALL,"vdec_os_api_lock error: point is NULL\n"); @@ -1201,7 +1198,7 @@ SIGN32 vdec_os_api_suspend_check(void) { // VMeta is ready to suspend SIGN32 vdec_os_api_suspend_ready(void) { if(vdec_iface == NULL) - return; + return 0; ioctl(vdec_iface->uiofd, VMETA_CMD_SUSPEND_READY); |