---

yaml --- r: 325277 b: refs/heads/master c: 443242d h: refs/heads/master i: 325275: 83ea1d7 v: v3
git-mirror · Sep 14, 2012 · 2d1a319 · 2d1a319
1 parent a87bddc
commit 2d1a319
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae1cbea5f9ae9d88da3ba7299f7d2d2574797f62
+refs/heads/master: 443242d2feb68c90fbd96de212d76d7858ac0834
diff --git a/trunk/drivers/staging/gdm72xx/usb_boot.c b/trunk/drivers/staging/gdm72xx/usb_boot.c
@@ -23,15 +23,13 @@
 #include "gdm_usb.h"
 #include "usb_boot.h"
 
-#define DN_KERNEL_MAGIC_NUMBER		0x10760001
-#define DN_ROOTFS_MAGIC_NUMBER		0x10760002
+#define DN_KERNEL_MAGIC_NUMBER	0x10760001
+#define DN_ROOTFS_MAGIC_NUMBER	0x10760002
 
-#define DOWNLOAD_SIZE	1024
+#define DOWNLOAD_SIZE		1024
 
-#define DH2B(x)		__cpu_to_be32(x)
-#define DL2H(x)		__le32_to_cpu(x)
-
-#define MIN(a, b)	((a) > (b) ? (b) : (a))
+#define DH2B(x)			__cpu_to_be32(x)
+#define DL2H(x)			__le32_to_cpu(x)
 
 #define MAX_IMG_CNT		16
 #define UIMG_PATH		"/lib/firmware/gdm72xx/gdmuimg.bin"
@@ -44,23 +42,23 @@ struct dn_header {
 };
 
 struct img_header {
-	u32		magic_code;
-	u32		count;
-	u32		len;
-	u32		offset[MAX_IMG_CNT];
+	u32	magic_code;
+	u32	count;
+	u32	len;
+	u32	offset[MAX_IMG_CNT];
 	char	hostname[32];
 	char	date[32];
 };
 
 struct fw_info {
-	u32		id;
-	u32		len;
-	u32		kernel_len;
-	u32		rootfs_len;
-	u32		kernel_offset;
-	u32		rootfs_offset;
-	u32		fw_ver;
-	u32		mac_ver;
+	u32	id;
+	u32	len;
+	u32	kernel_len;
+	u32	rootfs_len;
+	u32	kernel_offset;
+	u32	rootfs_offset;
+	u32	fw_ver;
+	u32	mac_ver;
 	char	hostname[32];
 	char	userid[16];
 	char	date[32];