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

Cc: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c
index cea46906408ecbc090aa988b51d7abe1fbf1b666..a5b448ea4eab54372a2263688cf04d2243775356 100644 (file)
--- 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) {

diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 7911151e56a34f2873d21aa45661d5a80252cd35..1f1e3982b1aa9499dcc996f08f084c3b20cebc17 100644 (file)
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -887,14 +887,14 @@ try_again:
        if (rc) {
                printk(KERN_WARNING
                       "%s: could not switch to 4-bit mode, error %d\n",
-                      card->dev.bus_id, rc);
+                      dev_name(&card->dev), rc);
                return 0;
        }
 
        msb->system = MEMSTICK_SYS_PAR4;
        host->set_param(host, MEMSTICK_INTERFACE, MEMSTICK_PAR4);
        printk(KERN_INFO "%s: switching to 4-bit parallel mode\n",
-              card->dev.bus_id);
+              dev_name(&card->dev));
 
        if (msb->caps & MEMSTICK_CAP_PAR8) {
                rc = mspro_block_set_interface(card, MEMSTICK_SYS_PAR8);
@@ -905,11 +905,11 @@ try_again:
                                        MEMSTICK_PAR8);
                        printk(KERN_INFO
                               "%s: switching to 8-bit parallel mode\n",
-                              card->dev.bus_id);
+                              dev_name(&card->dev));
                } else
                        printk(KERN_WARNING
                               "%s: could not switch to 8-bit mode, error %d\n",
-                              card->dev.bus_id, rc);
+                              dev_name(&card->dev), rc);
        }
 
        card->next_request = h_mspro_block_req_init;
@@ -922,7 +922,7 @@ try_again:
        if (rc) {
                printk(KERN_WARNING
                       "%s: interface error, trying to fall back to serial\n",
-                      card->dev.bus_id);
+                      dev_name(&card->dev));
                msb->system = MEMSTICK_SYS_SERIAL;
                host->set_param(host, MEMSTICK_POWER, MEMSTICK_POWER_OFF);
                msleep(10);
@@ -992,14 +992,14 @@ static int mspro_block_read_attributes(struct memstick_dev *card)
 
        if (be16_to_cpu(attr->signature) != MSPRO_BLOCK_SIGNATURE) {
                printk(KERN_ERR "%s: unrecognized device signature %x\n",
-                      card->dev.bus_id, be16_to_cpu(attr->signature));
+                      dev_name(&card->dev), be16_to_cpu(attr->signature));
                rc = -ENODEV;
                goto out_free_attr;
        }
 
        if (attr->count > MSPRO_BLOCK_MAX_ATTRIBUTES) {
                printk(KERN_WARNING "%s: way too many attribute entries\n",
-                      card->dev.bus_id);
+                      dev_name(&card->dev));
                attr_count = MSPRO_BLOCK_MAX_ATTRIBUTES;
        } else
                attr_count = attr->count;

diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c
index d32d6ad8f3fc5ab51017a6350c7d68aa4c42736b..03f71a431c8207f403fcf1924ffe3b9f3ce36659 100644 (file)
--- a/drivers/memstick/host/tifm_ms.c
+++ b/drivers/memstick/host/tifm_ms.c
@@ -546,7 +546,7 @@ static void tifm_ms_abort(unsigned long data)
        printk(KERN_ERR
               "%s : card failed to respond for a long period of time "
               "(%x, %x)\n",
-              host->dev->dev.bus_id, host->req ? host->req->tpc : 0,
+              dev_name(&host->dev->dev), host->req ? host->req->tpc : 0,
               host->cmd_flags);
 
        tifm_eject(host->dev);
@@ -561,7 +561,7 @@ static int tifm_ms_probe(struct tifm_dev *sock)
        if (!(TIFM_SOCK_STATE_OCCUPIED
              & readl(sock->addr + SOCK_PRESENT_STATE))) {
                printk(KERN_WARNING "%s : card gone, unexpectedly\n",
-                      sock->dev.bus_id);
+                      dev_name(&sock->dev));
                return rc;
        }