Browse Source

fpga: Change the first parameter in fpga_loadbitstream

All fpga functions use devnum as int. Only fpga_loadbitstream
is using it as unsinged long dev.
This patch synchronize it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@ti.com>
Michal Simek 12 năm trước cách đây
mục cha
commit
23f4bd756d
3 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 1 1
      drivers/fpga/fpga.c
  2. 2 2
      drivers/fpga/xilinx.c
  3. 1 1
      include/fpga.h

+ 1 - 1
drivers/fpga/fpga.c

@@ -190,7 +190,7 @@ int fpga_add(fpga_type devtype, void *desc)
 /*
  * Convert bitstream data and load into the fpga
  */
-int __weak fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size)
+int __weak fpga_loadbitstream(int devnum, char *fpgadata, size_t size)
 {
 	printf("Bitstream support not implemented for this FPGA device\n");
 	return FPGA_FAIL;

+ 2 - 2
drivers/fpga/xilinx.c

@@ -48,7 +48,7 @@ static int xilinx_validate (Xilinx_desc * desc, char *fn);
 
 /* ------------------------------------------------------------------------- */
 
-int fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size)
+int fpga_loadbitstream(int devnum, char *fpgadata, size_t size)
 {
 	unsigned int length;
 	unsigned int swapsize;
@@ -131,7 +131,7 @@ int fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size)
 	dataptr += 4;
 	printf("  bytes in bitstream = %d\n", swapsize);
 
-	return fpga_load(dev, dataptr, swapsize);
+	return fpga_load(devnum, dataptr, swapsize);
 }
 
 int xilinx_load(Xilinx_desc *desc, const void *buf, size_t bsize)

+ 1 - 1
include/fpga.h

@@ -68,7 +68,7 @@ extern void fpga_init(void);
 extern int fpga_add(fpga_type devtype, void *desc);
 extern int fpga_count(void);
 extern int fpga_load(int devnum, const void *buf, size_t bsize);
-extern int fpga_loadbitstream(unsigned long dev, char *fpgadata, size_t size);
+extern int fpga_loadbitstream(int devnum, char *fpgadata, size_t size);
 extern int fpga_dump(int devnum, const void *buf, size_t bsize);
 extern int fpga_info(int devnum);