Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c85e37c5 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ba88b002

drivers/pnp/card.c

+3 −4
Original line number Diff line number Diff line
@@ -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,7 +294,7 @@ 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_set_name(&dev->dev, "%02x:%02x.%02x",

		     dev->protocol->number, card->number, dev->number);

	spin_lock(&pnp_lock);

	dev->card = card;

drivers/pnp/core.c

+2 −3
Original line number Diff line number Diff line
@@ -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) {

drivers/pnp/system.c

+1 −1
Original line number Diff line number Diff line
@@ -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);