Merge branches 'release', 'APERF', 'ARAT', 'misc', 'kelvin', 'device-lock' and 'bjorn...

[sfrench/cifs-2.6.git] / drivers / pnp / card.c

diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index e75b060daa955231af4d52a79816fa4824a17d5b..4a651f69e17c0c2c26f1e30b1bfb6c187d2b25cb 100644 (file)
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -165,10 +165,9 @@ 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.coherent_dma_mask = DMA_BIT_MASK(24);
        card->dev.dma_mask = &card->dev.coherent_dma_mask;
 
        dev_id = pnp_add_card_id(card, pnpid);
@@ -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);