aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-22 08:00:42 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-26 17:52:03 -0400
commit8dece35daf098e5d086b50724119ffbb24ceca7f (patch)
tree27b3817f557524d6cb76e09ee14581cfdc378b80
parent212bdba38724f185344d8ea93f8db0eda1efc348 (diff)
[media] dm644x_ccdc: use unsigned long for fpc_table_addr
The fpc_table_addr is used as an unsigned integer that stores an address. At the Kernel, the proper type for such integers is unsigned long. This generates lots of warnings when compiling on 64 bits. Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/platform/davinci/dm644x_ccdc.c4
-rw-r--r--include/media/davinci/dm644x_ccdc.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/davinci/dm644x_ccdc.c b/drivers/media/platform/davinci/dm644x_ccdc.c
index b0b9cd54e9e9..62a0ebb01056 100644
--- a/drivers/media/platform/davinci/dm644x_ccdc.c
+++ b/drivers/media/platform/davinci/dm644x_ccdc.c
@@ -291,7 +291,7 @@ static int ccdc_update_raw_params(struct ccdc_config_params_raw *raw_params)
291 dev_dbg(ccdc_cfg.dev, "\n copy_from_user failed"); 291 dev_dbg(ccdc_cfg.dev, "\n copy_from_user failed");
292 return -EFAULT; 292 return -EFAULT;
293 } 293 }
294 config_params->fault_pxl.fpc_table_addr = (unsigned int)fpc_physaddr; 294 config_params->fault_pxl.fpc_table_addr = (unsigned long)fpc_physaddr;
295 return 0; 295 return 0;
296} 296}
297 297
@@ -506,7 +506,7 @@ static void ccdc_config_fpc(struct ccdc_fault_pixel *fpc)
506 506
507 /* Configure Fault pixel if needed */ 507 /* Configure Fault pixel if needed */
508 regw(fpc->fpc_table_addr, CCDC_FPC_ADDR); 508 regw(fpc->fpc_table_addr, CCDC_FPC_ADDR);
509 dev_dbg(ccdc_cfg.dev, "\nWriting 0x%x to FPC_ADDR...\n", 509 dev_dbg(ccdc_cfg.dev, "\nWriting 0x%lx to FPC_ADDR...\n",
510 (fpc->fpc_table_addr)); 510 (fpc->fpc_table_addr));
511 /* Write the FPC params with FPC disable */ 511 /* Write the FPC params with FPC disable */
512 val = fpc->fp_num & CCDC_FPC_FPC_NUM_MASK; 512 val = fpc->fp_num & CCDC_FPC_FPC_NUM_MASK;
diff --git a/include/media/davinci/dm644x_ccdc.h b/include/media/davinci/dm644x_ccdc.h
index 852e96c4bb46..984fb79031de 100644
--- a/include/media/davinci/dm644x_ccdc.h
+++ b/include/media/davinci/dm644x_ccdc.h
@@ -114,7 +114,7 @@ struct ccdc_fault_pixel {
114 /* Number of fault pixel */ 114 /* Number of fault pixel */
115 unsigned short fp_num; 115 unsigned short fp_num;
116 /* Address of fault pixel table */ 116 /* Address of fault pixel table */
117 unsigned int fpc_table_addr; 117 unsigned long fpc_table_addr;
118}; 118};
119 119
120/* Structure for CCDC configuration parameters for raw capture mode passed 120/* Structure for CCDC configuration parameters for raw capture mode passed