powerpc: of_parse_dma_window should take a __be32 *dma_window

We pass dma_window to of_parse_dma_window as a void * and then
run through hoops to cast it back to a u32 array. In the process
we lose endian annotation.

Simplify it by just passing a __be32 * down.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

2 files changed, 9 insertions, 10 deletions

diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 4e1331b8eb33..6295e646f78c 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -7,28 +7,27 @@
 #include <linux/of_address.h>
 #include <asm/prom.h>
 
-void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
-                unsigned long *busno, unsigned long *phys, unsigned long *size)
+void of_parse_dma_window(struct device_node *dn, const __be32 *dma_window,
+                         unsigned long *busno, unsigned long *phys,
+                         unsigned long *size)
 {
-        const u32 *dma_window;
         u32 cells;
-        const unsigned char *prop;
-
-        dma_window = dma_window_prop;
+        const __be32 *prop;
 
         /* busno is always one cell */
-        *busno = *(dma_window++);
+        *busno = of_read_number(dma_window, 1);
+        dma_window++;
 
         prop = of_get_property(dn, "ibm,#dma-address-cells", NULL);
         if (!prop)
                 prop = of_get_property(dn, "#address-cells", NULL);
 
-        cells = prop ? *(u32 *)prop : of_n_addr_cells(dn);
+        cells = prop ? of_read_number(prop, 1) : of_n_addr_cells(dn);
         *phys = of_read_number(dma_window, cells);
 
         dma_window += cells;
 
         prop = of_get_property(dn, "ibm,#dma-size-cells", NULL);
-        cells = prop ? *(u32 *)prop : of_n_size_cells(dn);
+        cells = prop ? of_read_number(prop, 1) : of_n_size_cells(dn);
         *size = of_read_number(dma_window, cells);
 }
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 536016d792ba..31875a6002b7 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1153,7 +1153,7 @@ EXPORT_SYMBOL(vio_h_cop_sync);
 
 static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
 {
-        const unsigned char *dma_window;
+        const __be32 *dma_window;
         struct iommu_table *tbl;
         unsigned long offset, size;