From: Minkyu Kang <mk7.kang@samsung.com>
Date: Wed, 1 Dec 2010 02:18:19 +0000 (+0900)
Subject: usbd: remove compiler warnings
X-Git-Tag: v0.2~221
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29adad8ff1d046086a32dbea5eb5fac56008e0fb;p=kernel%2Fu-boot.git

usbd: remove compiler warnings

cmd_usbd.c: In function 'write_file_mmc_part':
cmd_usbd.c:644: warning: unused variable 'tmp'

cmd_usbd.c:723: warning: passing argument 2 of 'memsize_parse' from incompatible pointer type
cmd_usbd.c:676: note: expected 'const char **' but argument is of type 'char **'

cmd_usbd.c: In function 'write_mmc_image':
cmd_usbd.c:741: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
cmd_usbd.c:742: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'

cmd_usbd.c:653: note: initialized from here
cmd_usbd.c:1405: warning: 'usbd' may be used uninitialized in this function

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
---

diff --git a/common/cmd_usbd.c b/common/cmd_usbd.c
index ec4c954..5cd0fae 100644
--- a/common/cmd_usbd.c
+++ b/common/cmd_usbd.c
@@ -36,7 +36,7 @@ static struct usbd_ops usbd_ops;
 
 static unsigned int part_id;
 static unsigned int write_part = 0;
-static unsigned long fs_offset = 0x0;
+static unsigned int fs_offset = 0x0;
 
 #ifdef CONFIG_USE_YAFFS
 static unsigned int yaffs_len = 0;
@@ -641,7 +641,6 @@ static int write_file_mmc_part(struct usbd_ops *usbd, char *ramaddr, u32 len,
 			if (mmc_part_write == 1) {
 				boot_sector *bs;
 				u32 total_sect;
-				u8 *tmp;
 				/* modify BPB data of p1 */
 				sprintf(length, "%x", (unsigned int)
 					(sizeof(struct mbr_table) /
@@ -700,7 +699,7 @@ static void set_mbr_info(struct usbd_ops *usbd, char *ramaddr, u32 len)
 	char mbr_str[256];
 	char save[16][16];
 	char *p;
-	char *tok, *ptr;
+	char *tok;
 	unsigned int size[16];
 	int i = 0;
 
@@ -720,15 +719,15 @@ static void set_mbr_info(struct usbd_ops *usbd, char *ramaddr, u32 len)
 
 	for (i = 0; i < mbr_parts; i++) {
 		p = save[i];
-		size[i] = memsize_parse(p, &p) / 512;
+		size[i] = memsize_parse(p, (const char **)&p) / 512;
 	}
 
 	puts("save the MBR Table...\n");
 	set_mbr_table(0x800, mbr_parts, size, mbr_offset);
 }
 
-static int write_mmc_image(struct usbd_ops *usbd, char *ramaddr, u32 len,
-		char *offset, char *length, int part_num)
+static int write_mmc_image(struct usbd_ops *usbd, char *ramaddr,
+		unsigned int len, char *offset, char *length, int part_num)
 {
 	int ret = 0;
 
@@ -846,7 +845,7 @@ static void erase_qboot_area(void)
 /* Parsing received data packet and Process data */
 static int process_data(struct usbd_ops *usbd)
 {
-	ulong cmd = 0, arg = 0, ofs = 0, len = 0, flag = 0;
+	unsigned int cmd = 0, arg = 0, ofs = 0, len = 0, flag = 0;
 	char offset[12], length[12], ramaddr[12];
 	int recvlen = 0;
 	unsigned int blocks = 0;
@@ -1394,6 +1393,10 @@ int do_usbd_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	if (err)
 		return err;
 
+	/* interface setting */
+	usbd = usbd_set_interface(&usbd_ops);
+	down_ram_addr = usbd->ram_addr;
+
 	/* get mbr info */
 	mbr_parts = get_mbr_table(mbr_offset);
 	if (!mbr_parts) {
@@ -1405,10 +1408,6 @@ int do_usbd_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		set_mbr_info(usbd, mbrparts, strlen(mbrparts));
 	}
 
-	/* interface setting */
-	usbd = usbd_set_interface(&usbd_ops);
-	down_ram_addr = usbd->ram_addr;
-
 	/* init the usb controller */
 	if (!usbd->usb_init()) {
 		usbd->down_cancel();
diff --git a/include/usbd.h b/include/usbd.h
index 19b12ca..d7d0ba4 100644
--- a/include/usbd.h
+++ b/include/usbd.h
@@ -125,9 +125,9 @@ struct usbd_ops {
 
 	/* mmc device info */
 	uint mmc_dev;
-	ulong mmc_max;
-	ulong mmc_blk;
-	ulong mmc_total;
+	uint mmc_max;
+	uint mmc_blk;
+	uint mmc_total;
 
 	void (*set_progress)(int);
 	void (*cpu_reset)(void);