Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / musb / musb_procfs.c

diff --git a/drivers/usb/musb/musb_procfs.c b/drivers/usb/musb/musb_procfs.c
index bd282da5b1b8c887f4a00fe6b7f410aaeda1692b..22c48d084a2564eaa696ddcad56402e214435d27 100644 (file)
--- a/drivers/usb/musb/musb_procfs.c
+++ b/drivers/usb/musb/musb_procfs.c
@@ -35,8 +35,8 @@
 #include <linux/kernel.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <asm/uaccess.h>       /* FIXME remove procfs writes */
-#include <asm/arch/hardware.h>
+#include <linux/uaccess.h>     /* FIXME remove procfs writes */
+#include <mach/hardware.h>
 
 #include "musb_core.h"
 
@@ -189,7 +189,7 @@ static int dump_ep(struct musb_ep *ep, char *buffer, unsigned max)
                        max -= code;
                        break;
                }
-               list_for_each_entry (req, &ep->req_list, list) {
+               list_for_each_entry(req, &ep->req_list, list) {
                        code = snprintf(buf, max, "\treq %p, %s%s%d/%d\n",
                                        req,
                                        req->zero ? "zero, " : "",
@@ -201,7 +201,7 @@ static int dump_ep(struct musb_ep *ep, char *buffer, unsigned max)
                        buf += code;
                        max -= code;
                }
-       } while(0);
+       } while (0);
        return buf - buffer;
 }
 #endif
@@ -453,7 +453,7 @@ dump_end_info(struct musb *musb, u8 epnum, char *aBuffer, unsigned max)
 
 /* Dump the current status and compile options.
  * @param musb the device driver instance
- * @param buffer where to dump the status; it must be big enough hold the
+ * @param buffer where to dump the status; it must be big enough to hold the
  * result otherwise "BAD THINGS HAPPENS(TM)".
  */
 static int dump_header_stats(struct musb *musb, char *buffer)
@@ -680,7 +680,7 @@ static int musb_proc_write(struct file *file, const char __user *buffer,
                        reg |= MUSB_DEVCTL_HR;
                        musb_writeb(mbase, MUSB_DEVCTL, reg);
                        /* MUSB_HST_MODE( ((struct musb*)data) ); */
-                       /* WARN("Host Mode\n"); */
+                       /* WARNING("Host Mode\n"); */
                }
                break;
 
@@ -700,7 +700,7 @@ static int musb_proc_write(struct file *file, const char __user *buffer,
                }
                break;
 
-#if (MUSB_DEBUG>0)
+#if (MUSB_DEBUG > 0)
                /* set/read debug level */
        case 'D':{
                        if (count > 1) {