diff options
| author | David Sin <davidsin@ti.com> | 2009-10-16 14:59:27 -0500 |
|---|---|---|
| committer | Wajahat Khan <w-khan@ti.com> | 2009-11-06 01:05:09 -0600 |
| commit | 5f3f6ddb7cc9e8b8766e3d18f52ff292ea223ac8 (patch) | |
| tree | f84774de0742d14adbe8176e868a8b7d4c5f6e70 | |
| parent | 5fbb305b9c224be69c303df6e0a66c45fd21f898 (diff) | |
fix check patch and compile warningstiler_pre_wake_up
| -rwxr-xr-x | drivers/media/video/tiler/dmm.c | 5 | ||||
| -rwxr-xr-x | drivers/media/video/tiler/dmm_hl_drv.c | 6 | ||||
| -rw-r--r-- | drivers/media/video/tiler/dmm_prv.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/video/tiler/dmm.c b/drivers/media/video/tiler/dmm.c index f5256ca83f01..4061fe413e90 100755 --- a/drivers/media/video/tiler/dmm.c +++ b/drivers/media/video/tiler/dmm.c @@ -876,11 +876,10 @@ unsigned long tiler_get_address(struct dmmViewOrientT orient, if (orient.dmmYInvert) y ^= y_mask; - if (orient.dmm90Rotate) { + if (orient.dmm90Rotate) tmp = ((x << y_bits) + y); - } else { + else tmp = ((y << x_bits) + x); - } return (unsigned long) DMM_COMPOSE_TILER_PTR((tmp << alignment), diff --git a/drivers/media/video/tiler/dmm_hl_drv.c b/drivers/media/video/tiler/dmm_hl_drv.c index 55f0d749fe73..04f43486b607 100755 --- a/drivers/media/video/tiler/dmm_hl_drv.c +++ b/drivers/media/video/tiler/dmm_hl_drv.c @@ -456,10 +456,12 @@ enum errorCodeT dmm_tiler_populate_pat_page_entry_data(unsigned long numPages, void *custmPagesPtr) { signed long iter; + unsigned long *patAreaEntries = NULL; tilerdump(__LINE__); - unsigned long *patAreaEntries = kmalloc( - (size_t)(numPages*4 + 16), GFP_KERNEL); + + patAreaEntries = kmalloc( + (numPages*4 + 16), GFP_KERNEL); /* Must be 16-byte aligned. */ memset(patAreaEntries, 0x0, (numPages*4 + 16)); *pageEntriesSpace = patAreaEntries; diff --git a/drivers/media/video/tiler/dmm_prv.h b/drivers/media/video/tiler/dmm_prv.h index be1f1ab5a75f..29e76a440e93 100644 --- a/drivers/media/video/tiler/dmm_prv.h +++ b/drivers/media/video/tiler/dmm_prv.h @@ -27,7 +27,7 @@ #define tilerdump(x) printk(KERN_NOTICE "%s():%s=(0x%08x)\n", \ __func__, #x, (int)x); #else -#define tilerdump(x) +#define tilerdump(x) #endif #define DMM__DMM DMM__DMM |