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

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index e75b060daa955231af4d52a79816fa4824a17d5b..efea128f02daa22bd59db27064bd58e574ffeee3 100644 (file)
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -165,8 +165,7 @@ struct pnp_card *pnp_alloc_card(struct pnp_protocol *protocol, int id, char *pnp
        card->number = id;
 
        card->dev.parent = &card->protocol->dev;
-       sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number,
-               card->number);
+       dev_set_name(&card->dev, "%02x:%02x", card->protocol->number, card->number);
 
        card->dev.coherent_dma_mask = DMA_24BIT_MASK;
        card->dev.dma_mask = &card->dev.coherent_dma_mask;
@@ -295,8 +294,8 @@ int pnp_add_card_device(struct pnp_card *card, struct pnp_dev *dev)
 {
        dev->dev.parent = &card->dev;
        dev->card_link = NULL;
-       snprintf(dev->dev.bus_id, BUS_ID_SIZE, "%02x:%02x.%02x",
-                dev->protocol->number, card->number, dev->number);
+       dev_set_name(&dev->dev, "%02x:%02x.%02x",
+                    dev->protocol->number, card->number, dev->number);
        spin_lock(&pnp_lock);
        dev->card = card;
        list_add_tail(&dev->card_list, &card->devices);

diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c
index 16c01c6fa7c589b92e0b827cd36d65fb5fbccad7..14814f231739fcfb975be5bda1b47b1a29fceb0c 100644 (file)
--- a/drivers/pnp/core.c
+++ b/drivers/pnp/core.c
@@ -70,7 +70,7 @@ int pnp_register_protocol(struct pnp_protocol *protocol)
        spin_unlock(&pnp_lock);
 
        protocol->number = nodenum;
-       sprintf(protocol->dev.bus_id, "pnp%d", nodenum);
+       dev_set_name(&protocol->dev, "pnp%d", nodenum);
        return device_register(&protocol->dev);
 }
 
@@ -145,8 +145,7 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid
        dev->dev.coherent_dma_mask = dev->dma_mask;
        dev->dev.release = &pnp_release_device;
 
-       sprintf(dev->dev.bus_id, "%02x:%02x", dev->protocol->number,
-               dev->number);
+       dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number);
 
        dev_id = pnp_add_id(dev, pnpid);
        if (!dev_id) {

diff --git a/drivers/pnp/system.c b/drivers/pnp/system.c
index 764f3a3106854056d3acec26ce77068908b0eb58..59b90922da8c324529c4d198c23b54211168f23f 100644 (file)
--- a/drivers/pnp/system.c
+++ b/drivers/pnp/system.c
@@ -26,7 +26,7 @@ static void reserve_range(struct pnp_dev *dev, resource_size_t start,
                          resource_size_t end, int port)
 {
        char *regionid;
-       const char *pnpid = dev->dev.bus_id;
+       const char *pnpid = dev_name(&dev->dev);
        struct resource *res;
 
        regionid = kmalloc(16, GFP_KERNEL);