aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Li <Frank.Li@freescale.com>2010-03-17 10:13:59 +0800
committerFrank Li <Frank.Li@freescale.com>2010-04-13 14:40:55 +0800
commit93531df035b4fb14dda0d43acb936b4b1b850e65 (patch)
tree9d679b838d8348a6dd6784a3057c5ccc9e3286d4
parent3928a0c74512274979e15f4e4e78dcddd45587c6 (diff)
ENGR00122437-1 Rename stmp_updater to fsl_updater
Rename stmp_updater to fsl_updater, as the updater will be shared across all i.MX platforms that needs MFGTool support. Signed-off-by: Frank Li <Frank.Li@freescale.com>
-rw-r--r--drivers/usb/gadget/file_storage.c4
-rw-r--r--drivers/usb/gadget/fsl_updater.c (renamed from drivers/usb/gadget/stmp_updater.c)7
-rw-r--r--drivers/usb/gadget/fsl_updater.h (renamed from drivers/usb/gadget/stmp_updater.h)10
3 files changed, 11 insertions, 10 deletions
diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 2843fd5b86da..66105ce49672 100644
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -725,7 +725,7 @@ struct fsg_dev {
};
#ifdef CONFIG_FSL_UTP
-#include "stmp_updater.h"
+#include "fsl_updater.h"
#endif
typedef void (*fsg_routine_t)(struct fsg_dev *);
@@ -3991,7 +3991,7 @@ static int __init check_parameters(struct fsg_dev *fsg)
return 0;
}
#ifdef CONFIG_FSL_UTP
-#include "stmp_updater.c"
+#include "fsl_updater.c"
#endif
static int __init fsg_bind(struct usb_gadget *gadget)
{
diff --git a/drivers/usb/gadget/stmp_updater.c b/drivers/usb/gadget/fsl_updater.c
index 99d7a46a6c9e..8b4b54f8cca7 100644
--- a/drivers/usb/gadget/stmp_updater.c
+++ b/drivers/usb/gadget/fsl_updater.c
@@ -1,7 +1,7 @@
/*
- * Freescale STMP378X UUT driver
+ * Freescale UUT driver
*
- * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2008-2010 Freescale Semiconductor, Inc.
* Copyright 2008-2009 Embedded Alley Solutions, Inc All Rights Reserved.
*/
@@ -16,7 +16,8 @@
static u64 get_be64(u8 *buf)
{
- return ((u64)get_unaligned_be32(buf) << 32) | get_unaligned_be32(buf + 4);
+ return ((u64)get_unaligned_be32(buf) << 32) |
+ get_unaligned_be32(buf + 4);
}
static int utp_init(struct fsg_dev *fsg)
diff --git a/drivers/usb/gadget/stmp_updater.h b/drivers/usb/gadget/fsl_updater.h
index 810e5f92aeb8..44329a9af58a 100644
--- a/drivers/usb/gadget/stmp_updater.h
+++ b/drivers/usb/gadget/fsl_updater.h
@@ -1,7 +1,7 @@
/*
- * Freescale STMP378X UUT driver
+ * Freescale UUT driver
*
- * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2008-2010 Freescale Semiconductor, Inc.
* Copyright 2008-2009 Embedded Alley Solutions, Inc All Rights Reserved.
*/
@@ -14,8 +14,8 @@
* http://www.gnu.org/copyleft/gpl.html
*/
-#ifndef __STMP_UPDATER_H
-#define __STMP_UPDATER_H
+#ifndef __FSL_UPDATER_H
+#define __FSL_UPDATER_H
#include <linux/miscdevice.h>
#include <linux/list.h>
@@ -136,5 +136,5 @@ static inline struct utp_context *UTP_CTX(struct fsg_dev *fsg)
return (struct utp_context *)fsg->utp;
}
-#endif /* __STMP_UPDATER_H */
+#endif /* __FSL_UPDATER_H */