#include <linux/slab.h>
 #include <linux/device.h>
 #include <linux/mm.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
 #include <linux/usb.h>
  */
 
 /* FIXME tune these based on pool statistics ... */
-static const size_t    pool_max [HCD_BUFFER_POOLS] = {
+static const size_t    pool_max[HCD_BUFFER_POOLS] = {
        /* platforms without dma-friendly caches might need to
         * prevent cacheline sharing...
         */
 int hcd_buffer_create(struct usb_hcd *hcd)
 {
        char            name[16];
-       int             i, size;
+       int             i, size;
 
        if (!hcd->self.controller->dma_mask &&
            !(hcd->driver->flags & HCD_LOCAL_MEM))
                snprintf(name, sizeof name, "buffer-%d", size);
                hcd->pool[i] = dma_pool_create(name, hcd->self.controller,
                                size, size, 0);
-               if (!hcd->pool [i]) {
+               if (!hcd->pool[i]) {
                        hcd_buffer_destroy(hcd);
                        return -ENOMEM;
                }
  */
 
 void *hcd_buffer_alloc(
-       struct usb_bus  *bus,
+       struct usb_bus          *bus,
        size_t                  size,
        gfp_t                   mem_flags,
        dma_addr_t              *dma
 )
 {
        struct usb_hcd          *hcd = bus_to_hcd(bus);
-       int                     i;
+       int                     i;
 
        /* some USB hosts just use PIO */
        if (!bus->controller->dma_mask &&
        }
 
        for (i = 0; i < HCD_BUFFER_POOLS; i++) {
-               if (size <= pool_max [i])
-                       return dma_pool_alloc(hcd->pool [i], mem_flags, dma);
+               if (size <= pool_max[i])
+                       return dma_pool_alloc(hcd->pool[i], mem_flags, dma);
        }
        return dma_alloc_coherent(hcd->self.controller, size, dma, mem_flags);
 }
 
 void hcd_buffer_free(
-       struct usb_bus  *bus,
+       struct usb_bus          *bus,
        size_t                  size,
-       void                    *addr,
+       void                    *addr,
        dma_addr_t              dma
 )
 {
        struct usb_hcd          *hcd = bus_to_hcd(bus);
-       int                     i;
+       int                     i;
 
        if (!addr)
                return;
        }
 
        for (i = 0; i < HCD_BUFFER_POOLS; i++) {
-               if (size <= pool_max [i]) {
-                       dma_pool_free(hcd->pool [i], addr, dma);
+               if (size <= pool_max[i]) {
+                       dma_pool_free(hcd->pool[i], addr, dma);
                        return;
                }
        }