Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (60 commits)
  uio: make uio_info's name and version const
  UIO: Documentation for UIO ioport info handling
  UIO: Pass information about ioports to userspace (V2)
  UIO: uio_pdrv_genirq: allow custom irq_flags
  UIO: use pci_ioremap_bar() in drivers/uio
  arm: struct device - replace bus_id with dev_name(), dev_set_name()
  libata: struct device - replace bus_id with dev_name(), dev_set_name()
  avr: struct device - replace bus_id with dev_name(), dev_set_name()
  block: struct device - replace bus_id with dev_name(), dev_set_name()
  chris: struct device - replace bus_id with dev_name(), dev_set_name()
  dmi: struct device - replace bus_id with dev_name(), dev_set_name()
  gadget: struct device - replace bus_id with dev_name(), dev_set_name()
  gpio: struct device - replace bus_id with dev_name(), dev_set_name()
  gpu: struct device - replace bus_id with dev_name(), dev_set_name()
  hwmon: struct device - replace bus_id with dev_name(), dev_set_name()
  i2o: struct device - replace bus_id with dev_name(), dev_set_name()
  IA64: struct device - replace bus_id with dev_name(), dev_set_name()
  i7300_idle: struct device - replace bus_id with dev_name(), dev_set_name()
  infiniband: struct device - replace bus_id with dev_name(), dev_set_name()
  ISDN: struct device - replace bus_id with dev_name(), dev_set_name()
  ...

10 files changed, 18 insertions, 18 deletions

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 60c079d8535..eed2f795e1b 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -817,7 +817,7 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
         ec->dma = NO_DMA;
         ec->ops = &ecard_default_ops;
 
-        snprintf(ec->dev.bus_id, sizeof(ec->dev.bus_id), "ecard%d", slot);
+        dev_set_name(&ec->dev, "ecard%d", slot);
         ec->dev.parent = NULL;
         ec->dev.bus = &ecard_bus_type;
         ec->dev.dma_mask = &ec->dma_mask;
diff --git a/arch/arm/mach-aaec2000/core.c b/arch/arm/mach-aaec2000/core.c
index 50e13965dfe..b5c5fc6ba3a 100644
--- a/arch/arm/mach-aaec2000/core.c
+++ b/arch/arm/mach-aaec2000/core.c
@@ -212,7 +212,7 @@ static struct clcd_board clcd_plat_data = {
 
 static struct amba_device clcd_device = {
         .dev            = {
-                .bus_id                 = "mb:16",
+                .init_name              = "mb:16",
                 .coherent_dma_mask      = ~0,
                 .platform_data          = &clcd_plat_data,
         },
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index 4781f323703..6d9152de607 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -409,7 +409,7 @@ static struct amba_pl010_data ep93xx_uart_data = {
 
 static struct amba_device uart1_device = {
         .dev            = {
-                .bus_id         = "apb:uart1",
+                .init_name      = "apb:uart1",
                 .platform_data  = &ep93xx_uart_data,
         },
         .res            = {
@@ -423,7 +423,7 @@ static struct amba_device uart1_device = {
 
 static struct amba_device uart2_device = {
         .dev            = {
-                .bus_id         = "apb:uart2",
+                .init_name      = "apb:uart2",
                 .platform_data  = &ep93xx_uart_data,
         },
         .res            = {
@@ -437,7 +437,7 @@ static struct amba_device uart2_device = {
 
 static struct amba_device uart3_device = {
         .dev            = {
-                .bus_id         = "apb:uart3",
+                .init_name      = "apb:uart3",
                 .platform_data  = &ep93xx_uart_data,
         },
         .res            = {
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index c89c949b4d4..6f887291307 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 427c2d8dc12..4ac04055c2e 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,
         },
diff --git a/arch/arm/mach-lh7a40x/clcd.c b/arch/arm/mach-lh7a40x/clcd.c
index a2a543258fc..c472b9e8b37 100644
--- a/arch/arm/mach-lh7a40x/clcd.c
+++ b/arch/arm/mach-lh7a40x/clcd.c
@@ -207,7 +207,7 @@ static struct clcd_board clcd_platform_data = {
 static struct amba_device name##_device = {                     \
         .dev = {                                                \
                 .coherent_dma_mask = ~0,                        \
-                .bus_id = busid,                                \
+                .init_name = busid,                             \
                 .platform_data = plat,                          \
                 },                                              \
         .res = {                                                \
diff --git a/arch/arm/mach-netx/fb.c b/arch/arm/mach-netx/fb.c
index 8f1f992f002..ea8fa8898fe 100644
--- a/arch/arm/mach-netx/fb.c
+++ b/arch/arm/mach-netx/fb.c
@@ -91,7 +91,7 @@ void clk_put(struct clk *clk)
 
 static struct amba_device fb_device = {
         .dev            = {
-                .bus_id = "fb",
+                .init_name = "fb",
                 .coherent_dma_mask = ~0,
         },
         .res            = {
diff --git a/arch/arm/mach-realview/core.h b/arch/arm/mach-realview/core.h
index 63be2abdc19..44269b162d4 100644
--- a/arch/arm/mach-realview/core.h
+++ b/arch/arm/mach-realview/core.h
@@ -31,7 +31,7 @@
 static struct amba_device name##_device = {                     \
         .dev            = {                                     \
                 .coherent_dma_mask = ~0,                        \
-                .bus_id = busid,                                \
+                .init_name = busid,                             \
                 .platform_data = plat,                          \
         },                                                      \
         .res            = {                                     \
diff --git a/arch/arm/mach-versatile/core.h b/arch/arm/mach-versatile/core.h
index afcaa858eb1..9d39886a835 100644
--- a/arch/arm/mach-versatile/core.h
+++ b/arch/arm/mach-versatile/core.h
@@ -34,7 +34,7 @@ extern unsigned int mmc_status(struct device *dev);
 static struct amba_device name##_device = {                     \
         .dev            = {                                     \
                 .coherent_dma_mask = ~0,                        \
-                .bus_id = busid,                                \
+                .init_name = busid,                             \
                 .platform_data = plat,                          \
         },                                                      \
         .res            = {                                     \
diff --git a/arch/arm/plat-omap/include/mach/memory.h b/arch/arm/plat-omap/include/mach/memory.h
index 211c9f6619e..d6b5ca6c7da 100644
--- a/arch/arm/plat-omap/include/mach/memory.h
+++ b/arch/arm/plat-omap/include/mach/memory.h
@@ -59,7 +59,7 @@
 
 #define virt_to_lbus(x)         ((x) - PAGE_OFFSET + OMAP1510_LB_OFFSET)
 #define lbus_to_virt(x)         ((x) - OMAP1510_LB_OFFSET + PAGE_OFFSET)
-#define is_lbus_device(dev)     (cpu_is_omap15xx() && dev && (strncmp(dev->bus_id, "ohci", 4) == 0))
+#define is_lbus_device(dev)     (cpu_is_omap15xx() && dev && (strncmp(dev_name(dev), "ohci", 4) == 0))
 
 #define __arch_page_to_dma(dev, page)   ({is_lbus_device(dev) ? \
                                         (dma_addr_t)virt_to_lbus(page_address(page)) : \