lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

microblaze: struct device - replace bus_id with dev_name()

Browse Source 
Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Michal Simek
2009-04-14 09:38:06 +02:00
parent a8fb748e89
commit 5a86dc1a74
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/microblaze/kernel/of_device.c
View File

@@ -13,7 +13,6 @@ void of_device_make_bus_id(struct of_device *dev)
{ {
static atomic_t bus_no_reg_magic; static atomic_t bus_no_reg_magic;
struct device_node *node = dev->node; struct device_node *node = dev->node;
char *name = dev->dev.bus_id;
const u32 *reg; const u32 *reg;
u64 addr; u64 addr;
int magic; int magic;
@@ -25,9 +24,8 @@ void of_device_make_bus_id(struct of_device *dev)
if (reg) { if (reg) {
addr = of_translate_address(node, reg); addr = of_translate_address(node, reg);
if (addr != OF_BAD_ADDR) { if (addr != OF_BAD_ADDR) {
snprintf(name, BUS_ID_SIZE, dev_set_name(&dev->dev, "%llx.%s",
"%llx.%s", (unsigned long long)addr, (unsigned long long)addr, node->name);
node->name);
return; return;
} }
} }
@@ -37,7 +35,7 @@ void of_device_make_bus_id(struct of_device *dev)
* counter (and pray...) * counter (and pray...)
*/ */
magic = atomic_add_return(1, &bus_no_reg_magic); magic = atomic_add_return(1, &bus_no_reg_magic);
snprintf(name, BUS_ID_SIZE, "%s.%d", node->name, magic - 1); dev_set_name(&dev->dev, "%s.%d", node->name, magic - 1);
} }
EXPORT_SYMBOL(of_device_make_bus_id); EXPORT_SYMBOL(of_device_make_bus_id);
@@ -58,7 +56,7 @@ struct of_device *of_device_alloc(struct device_node *np,
dev->dev.archdata.of_node = np; dev->dev.archdata.of_node = np;
if (bus_id) if (bus_id)
strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE); dev_set_name(&dev->dev, bus_id);
else else
of_device_make_bus_id(dev); of_device_make_bus_id(dev);