summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2014-05-16 13:16:49 +0200
committerMichal Simek <michal.simek@xilinx.com>2014-06-04 06:59:59 +0200
commitbf5db2fbd65e6225a8aa749d4e788e223518d486 (patch)
tree627919a727de52547e52d49431494edfc0470bd9
parent6b3f246e398cc9afc61e3a65a116fabb6d5ca7aa (diff)
downloadop-kernel-dev-bf5db2fbd65e6225a8aa749d4e788e223518d486.zip
op-kernel-dev-bf5db2fbd65e6225a8aa749d4e788e223518d486.tar.gz
microblaze: Use generic device.h
pdev_archdata dma_mask is completely unused. Use generic device.h Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--arch/microblaze/include/asm/Kbuild1
-rw-r--r--arch/microblaze/include/asm/device.h23
-rw-r--r--drivers/of/platform.c3
3 files changed, 1 insertions, 26 deletions
diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild
index c98ed95..35b3ecaf 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -2,6 +2,7 @@
generic-y += barrier.h
generic-y += clkdev.h
generic-y += cputime.h
+generic-y += device.h
generic-y += exec.h
generic-y += hash.h
generic-y += mcs_spinlock.h
diff --git a/arch/microblaze/include/asm/device.h b/arch/microblaze/include/asm/device.h
deleted file mode 100644
index aae3b3c..0000000
--- a/arch/microblaze/include/asm/device.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Arch specific extensions to struct device
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License v2. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#ifndef _ASM_MICROBLAZE_DEVICE_H
-#define _ASM_MICROBLAZE_DEVICE_H
-
-struct device_node;
-
-struct dev_archdata {
-};
-
-struct pdev_archdata {
- u64 dma_mask;
-};
-
-#endif /* _ASM_MICROBLAZE_DEVICE_H */
-
-
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index bd47fbc..a83b987 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -174,9 +174,6 @@ struct platform_device *of_device_alloc(struct device_node *np,
}
dev->dev.of_node = of_node_get(np);
-#if defined(CONFIG_MICROBLAZE)
- dev->dev.dma_mask = &dev->archdata.dma_mask;
-#endif
dev->dev.parent = parent;
if (bus_id)
OpenPOWER on IntegriCloud