[ARM] Remove MT_NONSHARED_DEVICE alias

Use MT_DEVICE_NONSHARED instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4 files changed, 7 insertions, 9 deletions

diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index 72586cd4372..cb1139ac194 100644
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -26,8 +26,6 @@ struct map_desc {
 #define MT_MEMORY               8
 #define MT_ROM                  9
 
-#define MT_NONSHARED_DEVICE     MT_DEVICE_NONSHARED
-
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);
 #else
diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c
index 30d842bd4d6..0589b5cd33c 100644
--- a/arch/arm/mach-mx3/mm.c
+++ b/arch/arm/mach-mx3/mm.c
@@ -49,7 +49,7 @@ static struct map_desc mxc_io_desc[] __initdata = {
                 .virtual        = AVIC_BASE_ADDR_VIRT,
                 .pfn            = __phys_to_pfn(AVIC_BASE_ADDR),
                 .length         = AVIC_SIZE,
-                .type           = MT_NONSHARED_DEVICE
+                .type           = MT_DEVICE_NONSHARED
         },
 };
 
diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c
index 60fb4e0d5ac..0cd90a9667c 100644
--- a/arch/arm/mach-mx3/mx31ads.c
+++ b/arch/arm/mach-mx3/mx31ads.c
@@ -92,17 +92,17 @@ static struct map_desc mx31ads_io_desc[] __initdata = {
                 .virtual        = AIPS1_BASE_ADDR_VIRT,
                 .pfn            = __phys_to_pfn(AIPS1_BASE_ADDR),
                 .length         = AIPS1_SIZE,
-                .type           = MT_NONSHARED_DEVICE
+                .type           = MT_DEVICE_NONSHARED
         }, {
                 .virtual        = SPBA0_BASE_ADDR_VIRT,
                 .pfn            = __phys_to_pfn(SPBA0_BASE_ADDR),
                 .length         = SPBA0_SIZE,
-                .type           = MT_NONSHARED_DEVICE
+                .type           = MT_DEVICE_NONSHARED
         }, {
                 .virtual        = AIPS2_BASE_ADDR_VIRT,
                 .pfn            = __phys_to_pfn(AIPS2_BASE_ADDR),
                 .length         = AIPS2_SIZE,
-                .type           = MT_NONSHARED_DEVICE
+                .type           = MT_DEVICE_NONSHARED
         }, {
                 .virtual        = CS4_BASE_ADDR_VIRT,
                 .pfn            = __phys_to_pfn(CS4_BASE_ADDR),
diff --git a/arch/arm/mach-mx3/mx31lite.c b/arch/arm/mach-mx3/mx31lite.c
index d363a6e79f8..c4344007014 100644
--- a/arch/arm/mach-mx3/mx31lite.c
+++ b/arch/arm/mach-mx3/mx31lite.c
@@ -45,17 +45,17 @@ static struct map_desc mx31lite_io_desc[] __initdata = {
                 .virtual = AIPS1_BASE_ADDR_VIRT,
                 .pfn = __phys_to_pfn(AIPS1_BASE_ADDR),
                 .length = AIPS1_SIZE,
-                .type = MT_NONSHARED_DEVICE
+                .type = MT_DEVICE_NONSHARED
         }, {
                 .virtual = SPBA0_BASE_ADDR_VIRT,
                 .pfn = __phys_to_pfn(SPBA0_BASE_ADDR),
                 .length = SPBA0_SIZE,
-                .type = MT_NONSHARED_DEVICE
+                .type = MT_DEVICE_NONSHARED
         }, {
                 .virtual = AIPS2_BASE_ADDR_VIRT,
                 .pfn = __phys_to_pfn(AIPS2_BASE_ADDR),
                 .length = AIPS2_SIZE,
-                .type = MT_NONSHARED_DEVICE
+                .type = MT_DEVICE_NONSHARED
         }, {
                 .virtual = CS4_BASE_ADDR_VIRT,
                 .pfn = __phys_to_pfn(CS4_BASE_ADDR),