diff options
author | Anton Blanchard <anton@samba.org> | 2013-08-06 12:01:36 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-08-14 01:33:26 -0400 |
commit | 2083f681e3898394dcf5fb3285bb385e21facb9a (patch) | |
tree | 738978fefec58c5bf2c4d4e7fec5fbcd3e60fdd4 /arch/powerpc/platforms/pseries/iommu.c | |
parent | d213dd5348532051e19150797aeef36099a4ade9 (diff) |
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>
Diffstat (limited to 'arch/powerpc/platforms/pseries/iommu.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 23fc1dcf4434..9087f9768781 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
@@ -530,7 +530,7 @@ static void iommu_table_setparms(struct pci_controller *phb, | |||
530 | static void iommu_table_setparms_lpar(struct pci_controller *phb, | 530 | static void iommu_table_setparms_lpar(struct pci_controller *phb, |
531 | struct device_node *dn, | 531 | struct device_node *dn, |
532 | struct iommu_table *tbl, | 532 | struct iommu_table *tbl, |
533 | const void *dma_window) | 533 | const __be32 *dma_window) |
534 | { | 534 | { |
535 | unsigned long offset, size; | 535 | unsigned long offset, size; |
536 | 536 | ||
@@ -630,7 +630,7 @@ static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus) | |||
630 | struct iommu_table *tbl; | 630 | struct iommu_table *tbl; |
631 | struct device_node *dn, *pdn; | 631 | struct device_node *dn, *pdn; |
632 | struct pci_dn *ppci; | 632 | struct pci_dn *ppci; |
633 | const void *dma_window = NULL; | 633 | const __be32 *dma_window = NULL; |
634 | 634 | ||
635 | dn = pci_bus_to_OF_node(bus); | 635 | dn = pci_bus_to_OF_node(bus); |
636 | 636 | ||
@@ -1152,7 +1152,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev) | |||
1152 | { | 1152 | { |
1153 | struct device_node *pdn, *dn; | 1153 | struct device_node *pdn, *dn; |
1154 | struct iommu_table *tbl; | 1154 | struct iommu_table *tbl; |
1155 | const void *dma_window = NULL; | 1155 | const __be32 *dma_window = NULL; |
1156 | struct pci_dn *pci; | 1156 | struct pci_dn *pci; |
1157 | 1157 | ||
1158 | pr_debug("pci_dma_dev_setup_pSeriesLP: %s\n", pci_name(dev)); | 1158 | pr_debug("pci_dma_dev_setup_pSeriesLP: %s\n", pci_name(dev)); |
@@ -1201,7 +1201,7 @@ static int dma_set_mask_pSeriesLP(struct device *dev, u64 dma_mask) | |||
1201 | bool ddw_enabled = false; | 1201 | bool ddw_enabled = false; |
1202 | struct device_node *pdn, *dn; | 1202 | struct device_node *pdn, *dn; |
1203 | struct pci_dev *pdev; | 1203 | struct pci_dev *pdev; |
1204 | const void *dma_window = NULL; | 1204 | const __be32 *dma_window = NULL; |
1205 | u64 dma_offset; | 1205 | u64 dma_offset; |
1206 | 1206 | ||
1207 | if (!dev->dma_mask) | 1207 | if (!dev->dma_mask) |