]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
of/platform: Fix microblaze build failure
authorGuenter Roeck <linux@roeck-us.net>
Tue, 10 Jun 2014 18:59:14 +0000 (11:59 -0700)
committerRob Herring <robh@kernel.org>
Mon, 16 Jun 2014 18:31:43 +0000 (13:31 -0500)
Commit bf5db2f (microblaze: Use generic device.h) removes the
microblaze specific pdev_archdata and dma_mask.

At the same time, commit 591c1ee (of: configure the platform
device dma parameters) initializes the just removed field.
This causes all microblaze builds to fail.

Drop the unnecessary initialization.

Cc: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Acked-by: Michal Simek <monstr@monstr.eu>
Signed-off-by: Rob Herring <robh@kernel.org>
drivers/of/platform.c

index 6c48d73a7fd7c0f60d6a5a1d82c65b3045d1d3a5..500436f9be7f8257e17965e53eeb1dcf276221d3 100644 (file)
@@ -166,10 +166,6 @@ static void of_dma_configure(struct platform_device *pdev)
        int ret;
        struct device *dev = &pdev->dev;
 
-#if defined(CONFIG_MICROBLAZE)
-       pdev->archdata.dma_mask = 0xffffffffUL;
-#endif
-
        /*
         * Set default dma-mask to 32 bit. Drivers are expected to setup
         * the correct supported dma_mask.