diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 19:38:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 19:38:23 -0400 |
commit | b2bf61f23f74d5b5aa35f242a2fe2f08ce4a53e7 (patch) | |
tree | d60426e3ad8286d63117d45a3080db9f9ec8f293 | |
parent | cf43f4ab3a065296822bb245975d006707ccde8d (diff) |
mfd: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: sameo@openedhand.com
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
-rw-r--r-- | drivers/mfd/mcp-core.c | 2 | ||||
-rw-r--r-- | drivers/mfd/ucb1x00-core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/mcp-core.c b/drivers/mfd/mcp-core.c index 6063dc2b52e8..57271cb3b316 100644 --- a/drivers/mfd/mcp-core.c +++ b/drivers/mfd/mcp-core.c | |||
@@ -214,7 +214,7 @@ EXPORT_SYMBOL(mcp_host_alloc); | |||
214 | 214 | ||
215 | int mcp_host_register(struct mcp *mcp) | 215 | int mcp_host_register(struct mcp *mcp) |
216 | { | 216 | { |
217 | strcpy(mcp->attached_device.bus_id, "mcp0"); | 217 | dev_set_name(&mcp->attached_device, "mcp0"); |
218 | return device_register(&mcp->attached_device); | 218 | return device_register(&mcp->attached_device); |
219 | } | 219 | } |
220 | EXPORT_SYMBOL(mcp_host_register); | 220 | EXPORT_SYMBOL(mcp_host_register); |
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 6860c924f364..fea9085fe52c 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c | |||
@@ -492,7 +492,7 @@ static int ucb1x00_probe(struct mcp *mcp) | |||
492 | 492 | ||
493 | ucb->dev.class = &ucb1x00_class; | 493 | ucb->dev.class = &ucb1x00_class; |
494 | ucb->dev.parent = &mcp->attached_device; | 494 | ucb->dev.parent = &mcp->attached_device; |
495 | strlcpy(ucb->dev.bus_id, "ucb1x00", sizeof(ucb->dev.bus_id)); | 495 | dev_set_name(&ucb->dev, "ucb1x00"); |
496 | 496 | ||
497 | spin_lock_init(&ucb->lock); | 497 | spin_lock_init(&ucb->lock); |
498 | spin_lock_init(&ucb->io_lock); | 498 | spin_lock_init(&ucb->io_lock); |