瀏覽代碼

[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>
Mauro Carvalho Chehab 11 年之前
父節點
當前提交
8dece35daf
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      drivers/media/platform/davinci/dm644x_ccdc.c
  2. 1 1
      include/media/davinci/dm644x_ccdc.h

+ 2 - 2
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");
 		dev_dbg(ccdc_cfg.dev, "\n copy_from_user failed");
 		return -EFAULT;
 		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;
 	return 0;
 }
 }
 
 
@@ -506,7 +506,7 @@ static void ccdc_config_fpc(struct ccdc_fault_pixel *fpc)
 
 
 	/* Configure Fault pixel if needed */
 	/* Configure Fault pixel if needed */
 	regw(fpc->fpc_table_addr, CCDC_FPC_ADDR);
 	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));
 		       (fpc->fpc_table_addr));
 	/* Write the FPC params with FPC disable */
 	/* Write the FPC params with FPC disable */
 	val = fpc->fp_num & CCDC_FPC_FPC_NUM_MASK;
 	val = fpc->fp_num & CCDC_FPC_FPC_NUM_MASK;

+ 1 - 1
include/media/davinci/dm644x_ccdc.h

@@ -114,7 +114,7 @@ struct ccdc_fault_pixel {
 	/* Number of fault pixel */
 	/* Number of fault pixel */
 	unsigned short fp_num;
 	unsigned short fp_num;
 	/* Address of fault pixel table */
 	/* 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
 /* Structure for CCDC configuration parameters for raw capture mode passed