Skip to content

Commit

Permalink
of/device: Fix build errors for non-ppc and non-microblaze
Browse files Browse the repository at this point in the history
Only powerpc and microblaze supply (struct device *)->archdata.dma_mask.
This patch stops referencing it on other architectures.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
  • Loading branch information
Grant Likely committed Jul 19, 2010
1 parent c5f5849 commit 9e3288d
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions drivers/of/platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
#include <linux/device.h>
#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/of_platform.h>

#if defined(CONFIG_PPC_DCR)
Expand Down Expand Up @@ -511,7 +513,9 @@ struct of_device *of_device_alloc(struct device_node *np,
}

dev->dev.of_node = of_node_get(np);
#if defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
dev->dev.dma_mask = &dev->archdata.dma_mask;
#endif
dev->dev.parent = parent;
dev->dev.release = of_release_dev;

Expand Down Expand Up @@ -540,7 +544,9 @@ struct of_device *of_platform_device_create(struct device_node *np,
if (!dev)
return NULL;

#if defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
dev->archdata.dma_mask = 0xffffffffUL;
#endif
dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
dev->dev.bus = &of_platform_bus_type;

Expand Down

0 comments on commit 9e3288d

Please sign in to comment.