From 0252c3b4f0188ceb9ce48a340e6bfd17ab28afa7 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 6 Jan 2009 10:44:38 -0800 Subject: memstick: struct device - replace bus_id with dev_name(), dev_set_name() Cc: Alex Dubov Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman --- drivers/memstick/core/memstick.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/memstick/core/memstick.c') diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c index cea46906408..a5b448ea4ea 100644 --- a/drivers/memstick/core/memstick.c +++ b/drivers/memstick/core/memstick.c @@ -385,8 +385,7 @@ static struct memstick_dev *memstick_alloc_card(struct memstick_host *host) if (card) { card->host = host; - snprintf(card->dev.bus_id, sizeof(card->dev.bus_id), - "%s", host->dev.bus_id); + dev_set_name(&card->dev, "%s", dev_name(&host->dev)); card->dev.parent = &host->dev; card->dev.bus = &memstick_bus_type; card->dev.release = memstick_free_card; @@ -519,7 +518,7 @@ int memstick_add_host(struct memstick_host *host) if (rc) return rc; - snprintf(host->dev.bus_id, BUS_ID_SIZE, "memstick%u", host->id); + dev_set_name(&host->dev, "memstick%u", host->id); rc = device_add(&host->dev); if (rc) { -- cgit v1.2.3