diff options
Diffstat (limited to 'drivers/pnp/card.c')
-rw-r--r-- | drivers/pnp/card.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index e75b060daa95..efea128f02da 100644 --- 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 | |||
165 | card->number = id; | 165 | card->number = id; |
166 | 166 | ||
167 | card->dev.parent = &card->protocol->dev; | 167 | card->dev.parent = &card->protocol->dev; |
168 | sprintf(card->dev.bus_id, "%02x:%02x", card->protocol->number, | 168 | dev_set_name(&card->dev, "%02x:%02x", card->protocol->number, card->number); |
169 | card->number); | ||
170 | 169 | ||
171 | card->dev.coherent_dma_mask = DMA_24BIT_MASK; | 170 | card->dev.coherent_dma_mask = DMA_24BIT_MASK; |
172 | card->dev.dma_mask = &card->dev.coherent_dma_mask; | 171 | 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) | |||
295 | { | 294 | { |
296 | dev->dev.parent = &card->dev; | 295 | dev->dev.parent = &card->dev; |
297 | dev->card_link = NULL; | 296 | dev->card_link = NULL; |
298 | snprintf(dev->dev.bus_id, BUS_ID_SIZE, "%02x:%02x.%02x", | 297 | dev_set_name(&dev->dev, "%02x:%02x.%02x", |
299 | dev->protocol->number, card->number, dev->number); | 298 | dev->protocol->number, card->number, dev->number); |
300 | spin_lock(&pnp_lock); | 299 | spin_lock(&pnp_lock); |
301 | dev->card = card; | 300 | dev->card = card; |
302 | list_add_tail(&dev->card_list, &card->devices); | 301 | list_add_tail(&dev->card_list, &card->devices); |