diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-03-24 16:38:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-03-24 16:38:23 -0700 |
| commit | b2bf61f23f74d5b5aa35f242a2fe2f08ce4a53e7 (patch) | |
| tree | d60426e3ad8286d63117d45a3080db9f9ec8f293 /drivers/mfd | |
| parent | cf43f4ab3a065296822bb245975d006707ccde8d (diff) | |
| download | linux-3.10-b2bf61f23f74d5b5aa35f242a2fe2f08ce4a53e7.tar.gz linux-3.10-b2bf61f23f74d5b5aa35f242a2fe2f08ce4a53e7.tar.bz2 linux-3.10-b2bf61f23f74d5b5aa35f242a2fe2f08ce4a53e7.zip | |
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>
Diffstat (limited to 'drivers/mfd')
| -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 6063dc2b52e..57271cb3b31 100644 --- a/drivers/mfd/mcp-core.c +++ b/drivers/mfd/mcp-core.c @@ -214,7 +214,7 @@ EXPORT_SYMBOL(mcp_host_alloc); int mcp_host_register(struct mcp *mcp) { - strcpy(mcp->attached_device.bus_id, "mcp0"); + dev_set_name(&mcp->attached_device, "mcp0"); return device_register(&mcp->attached_device); } EXPORT_SYMBOL(mcp_host_register); diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 6860c924f36..fea9085fe52 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c @@ -492,7 +492,7 @@ static int ucb1x00_probe(struct mcp *mcp) ucb->dev.class = &ucb1x00_class; ucb->dev.parent = &mcp->attached_device; - strlcpy(ucb->dev.bus_id, "ucb1x00", sizeof(ucb->dev.bus_id)); + dev_set_name(&ucb->dev, "ucb1x00"); spin_lock_init(&ucb->lock); spin_lock_init(&ucb->io_lock); |