diff options
| author | Mauro Carvalho Chehab | 2014-08-22 14:00:42 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2014-08-26 23:52:03 +0200 |
| commit | 8dece35daf098e5d086b50724119ffbb24ceca7f (patch) | |
| tree | 27b3817f557524d6cb76e09ee14581cfdc378b80 | |
| parent | [media] vpif: don't cast pointers to int (diff) | |
| download | kernel-qcow2-linux-8dece35daf098e5d086b50724119ffbb24ceca7f.tar.gz kernel-qcow2-linux-8dece35daf098e5d086b50724119ffbb24ceca7f.tar.xz kernel-qcow2-linux-8dece35daf098e5d086b50724119ffbb24ceca7f.zip | |
[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.c | 4 | ||||
| -rw-r--r-- | include/media/davinci/dm644x_ccdc.h | 2 |
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) dev_dbg(ccdc_cfg.dev, "\n copy_from_user failed"); return -EFAULT; } - config_params->fault_pxl.fpc_table_addr = (unsigned int)fpc_physaddr; + config_params->fault_pxl.fpc_table_addr = (unsigned long)fpc_physaddr; return 0; } @@ -506,7 +506,7 @@ static void ccdc_config_fpc(struct ccdc_fault_pixel *fpc) /* Configure Fault pixel if needed */ regw(fpc->fpc_table_addr, CCDC_FPC_ADDR); - dev_dbg(ccdc_cfg.dev, "\nWriting 0x%x to FPC_ADDR...\n", + dev_dbg(ccdc_cfg.dev, "\nWriting 0x%lx to FPC_ADDR...\n", (fpc->fpc_table_addr)); /* Write the FPC params with FPC disable */ 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 { /* Number of fault pixel */ unsigned short fp_num; /* Address of fault pixel table */ - unsigned int fpc_table_addr; + unsigned long fpc_table_addr; }; /* Structure for CCDC configuration parameters for raw capture mode passed |