Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2bf61f2 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



Cc: sameo@openedhand.com
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
parent cf43f4ab

drivers/mfd/mcp-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/mfd/ucb1x00-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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);