4 files changed, 30 insertions, 23 deletions

diff --git a/arch/arm/common/amba.c b/arch/arm/common/amba.c
index a0507f8c33fe..c6beb751f2a9 100644
--- a/arch/arm/common/amba.c
+++ b/arch/arm/common/amba.c
@@ -169,7 +169,7 @@ static void amba_device_release(struct device *dev)
 }
 
 #define amba_attr(name,fmt,arg...)                              \
-static ssize_t show_##name(struct device *_dev, char *buf)      \
+static ssize_t show_##name(struct device *_dev, struct device_attribute *attr, char *buf)       \
 {                                                               \
         struct amba_device *dev = to_amba_device(_dev);         \
         return sprintf(buf, fmt, arg);                          \
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
index 5797b1b100a1..cbf2165476b0 100644
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@ -30,6 +30,8 @@
 #include <linux/dmapool.h>
 #include <linux/list.h>
 
+#include <asm/cacheflush.h>
+
 #undef DEBUG
 
 #undef STATS
@@ -91,15 +93,12 @@ static void print_alloc_stats(struct dmabounce_device_info *device_info)
 static inline struct dmabounce_device_info *
 find_dmabounce_dev(struct device *dev)
 {
-        struct list_head *entry;
-
-        list_for_each(entry, &dmabounce_devs) {
-                struct dmabounce_device_info *d =
-                        list_entry(entry, struct dmabounce_device_info, node);
+        struct dmabounce_device_info *d;
 
+        list_for_each_entry(d, &dmabounce_devs, node)
                 if (d->dev == dev)
                         return d;
-        }
+
         return NULL;
 }
 
@@ -170,15 +169,11 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,
 static inline struct safe_buffer *
 find_safe_buffer(struct dmabounce_device_info *device_info, dma_addr_t safe_dma_addr)
 {
-        struct list_head *entry;
-
-        list_for_each(entry, &device_info->safe_buffers) {
-                struct safe_buffer *b =
-                        list_entry(entry, struct safe_buffer, node);
+        struct safe_buffer *b;
 
+        list_for_each_entry(b, &device_info->safe_buffers, node)
                 if (b->safe_dma_addr == safe_dma_addr)
                         return b;
-        }
 
         return NULL;
 }
@@ -299,15 +294,26 @@ unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
                         __func__, buf->ptr, (void *) virt_to_dma(dev, buf->ptr),
                         buf->safe, (void *) buf->safe_dma_addr);
 
-
                 DO_STATS ( device_info->bounce_count++ );
 
-                if ((dir == DMA_FROM_DEVICE) ||
-                    (dir == DMA_BIDIRECTIONAL)) {
+                if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL) {
+                        unsigned long ptr;
+
                         dev_dbg(dev,
                                 "%s: copy back safe %p to unsafe %p size %d\n",
                                 __func__, buf->safe, buf->ptr, size);
                         memcpy(buf->ptr, buf->safe, size);
+
+                        /*
+                         * DMA buffers must have the same cache properties
+                         * as if they were really used for DMA - which means
+                         * data must be written back to RAM.  Note that
+                         * we don't use dmac_flush_range() here for the
+                         * bidirectional case because we know the cache
+                         * lines will be coherent with the data written.
+                         */
+                        ptr = (unsigned long)buf->ptr;
+                        dmac_clean_range(ptr, ptr + size);
                 }
                 free_safe_buffer(device_info, buf);
         }
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 21fce3414ed1..38c2eb667eb9 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -721,16 +721,17 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
         return ret;
 }
 
+static int sa1111_remove_one(struct device *dev, void *data)
+{
+        device_unregister(dev);
+        return 0;
+}
+
 static void __sa1111_remove(struct sa1111 *sachip)
 {
-        struct list_head *l, *n;
         void __iomem *irqbase = sachip->base + SA1111_INTC;
 
-        list_for_each_safe(l, n, &sachip->dev->children) {
-                struct device *d = list_to_dev(l);
-
-                device_unregister(d);
-        }
+        device_for_each_child(sachip->dev, NULL, sa1111_remove_one);
 
         /* disable all IRQs */
         sa1111_writel(0, irqbase + SA1111_INTEN0);
diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c
index c2c557a224c2..c94864c5b1af 100644
--- a/arch/arm/common/sharpsl_param.c
+++ b/arch/arm/common/sharpsl_param.c
@@ -22,7 +22,7 @@
  * them early in the boot process, then pass them to the appropriate drivers.
  * Not all devices use all paramaters but the format is common to all.
  */
-#ifdef ARCH_SA1100
+#ifdef CONFIG_ARCH_SA1100
 #define PARAM_BASE      0xe8ffc000
 #else
 #define PARAM_BASE      0xa0000a00