arm: struct device - replace bus_id with dev_name(), dev_set_name()

Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 8 insertions, 8 deletions

diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index c89c949b4d45..6f8872913073 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -37,7 +37,7 @@ static struct amba_pl010_data integrator_uart_data;
 
 static struct amba_device rtc_device = {
         .dev            = {
-                .bus_id = "mb:15",
+                .init_name = "mb:15",
         },
         .res            = {
                 .start  = INTEGRATOR_RTC_BASE,
@@ -50,7 +50,7 @@ static struct amba_device rtc_device = {
 
 static struct amba_device uart0_device = {
         .dev            = {
-                .bus_id = "mb:16",
+                .init_name = "mb:16",
                 .platform_data = &integrator_uart_data,
         },
         .res            = {
@@ -64,7 +64,7 @@ static struct amba_device uart0_device = {
 
 static struct amba_device uart1_device = {
         .dev            = {
-                .bus_id = "mb:17",
+                .init_name = "mb:17",
                 .platform_data = &integrator_uart_data,
         },
         .res            = {
@@ -78,7 +78,7 @@ static struct amba_device uart1_device = {
 
 static struct amba_device kmi0_device = {
         .dev            = {
-                .bus_id = "mb:18",
+                .init_name = "mb:18",
         },
         .res            = {
                 .start  = KMI0_BASE,
@@ -91,7 +91,7 @@ static struct amba_device kmi0_device = {
 
 static struct amba_device kmi1_device = {
         .dev            = {
-                .bus_id = "mb:19",
+                .init_name = "mb:19",
         },
         .res            = {
                 .start  = KMI1_BASE,
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 427c2d8dc123..4ac04055c2ea 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -407,7 +407,7 @@ static struct mmc_platform_data mmc_data = {
 
 static struct amba_device mmc_device = {
         .dev            = {
-                .bus_id = "mb:1c",
+                .init_name = "mb:1c",
                 .platform_data = &mmc_data,
         },
         .res            = {
@@ -421,7 +421,7 @@ static struct amba_device mmc_device = {
 
 static struct amba_device aaci_device = {
         .dev            = {
-                .bus_id = "mb:1d",
+                .init_name = "mb:1d",
         },
         .res            = {
                 .start  = INTCP_PA_AACI_BASE,
@@ -532,7 +532,7 @@ static struct clcd_board clcd_data = {
 
 static struct amba_device clcd_device = {
         .dev            = {
-                .bus_id = "mb:c0",
+                .init_name = "mb:c0",
                 .coherent_dma_mask = ~0,
                 .platform_data = &clcd_data,
         },