aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2014-05-16 07:16:49 -0400
committerMichal Simek <michal.simek@xilinx.com>2014-06-04 00:59:59 -0400
commitbf5db2fbd65e6225a8aa749d4e788e223518d486 (patch)
tree627919a727de52547e52d49431494edfc0470bd9
parent6b3f246e398cc9afc61e3a65a116fabb6d5ca7aa (diff)
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 c98ed95c0541..35b3ecaf25d5 100644
--- a/arch/microblaze/include/asm/Kbuild
+++ b/arch/microblaze/include/asm/Kbuild
@@ -2,6 +2,7 @@
2generic-y += barrier.h 2generic-y += barrier.h
3generic-y += clkdev.h 3generic-y += clkdev.h
4generic-y += cputime.h 4generic-y += cputime.h
5generic-y += device.h
5generic-y += exec.h 6generic-y += exec.h
6generic-y += hash.h 7generic-y += hash.h
7generic-y += mcs_spinlock.h 8generic-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 aae3b3c6a033..000000000000
--- a/arch/microblaze/include/asm/device.h
+++ /dev/null
@@ -1,23 +0,0 @@
1/*
2 * Arch specific extensions to struct device
3 *
4 * This file is subject to the terms and conditions of the GNU General Public
5 * License v2. See the file "COPYING" in the main directory of this archive
6 * for more details.
7 */
8
9#ifndef _ASM_MICROBLAZE_DEVICE_H
10#define _ASM_MICROBLAZE_DEVICE_H
11
12struct device_node;
13
14struct dev_archdata {
15};
16
17struct pdev_archdata {
18 u64 dma_mask;
19};
20
21#endif /* _ASM_MICROBLAZE_DEVICE_H */
22
23
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index bd47fbc53dc9..a83b98784150 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,
174 } 174 }
175 175
176 dev->dev.of_node = of_node_get(np); 176 dev->dev.of_node = of_node_get(np);
177#if defined(CONFIG_MICROBLAZE)
178 dev->dev.dma_mask = &dev->archdata.dma_mask;
179#endif
180 dev->dev.parent = parent; 177 dev->dev.parent = parent;
181 178
182 if (bus_id) 179 if (bus_id)