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

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

3 files changed, 4 insertions, 7 deletions

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 0d9b2d6f9ebf..f210a8ee6861 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -216,8 +216,7 @@ int mmc_add_card(struct mmc_card *card)
         int ret;
         const char *type;
 
-        snprintf(card->dev.bus_id, sizeof(card->dev.bus_id),
-                 "%s:%04x", mmc_hostname(card->host), card->rca);
+        dev_set_name(&card->dev, "%s:%04x", mmc_hostname(card->host), card->rca);
 
         switch (card->type) {
         case MMC_TYPE_MMC:
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c
index 6da80fd4d974..5e945e64ead7 100644
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
@@ -73,8 +73,7 @@ struct mmc_host *mmc_alloc_host(int extra, struct device *dev)
         if (err)
                 goto free;
 
-        snprintf(host->class_dev.bus_id, BUS_ID_SIZE,
-                 "mmc%d", host->index);
+        dev_set_name(&host->class_dev, "mmc%d", host->index);
 
         host->parent = dev;
         host->class_dev.parent = dev;
@@ -121,7 +120,7 @@ int mmc_add_host(struct mmc_host *host)
         WARN_ON((host->caps & MMC_CAP_SDIO_IRQ) &&
                 !host->ops->enable_sdio_irq);
 
-        led_trigger_register_simple(host->class_dev.bus_id, &host->led);
+        led_trigger_register_simple(dev_name(&host->class_dev), &host->led);
 
         err = device_add(&host->class_dev);
         if (err)
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c
index 233d0f9b3c4b..46284b527397 100644
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
@@ -239,8 +239,7 @@ int sdio_add_func(struct sdio_func *func)
 {
         int ret;
 
-        snprintf(func->dev.bus_id, sizeof(func->dev.bus_id),
-                 "%s:%d", mmc_card_id(func->card), func->num);
+        dev_set_name(&func->dev, "%s:%d", mmc_card_id(func->card), func->num);
 
         ret = device_add(&func->dev);
         if (ret == 0)