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

Commit c6c4f070 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Jesse Barnes
Browse files

PCI: make pci_name use dev_name 



Also fixes up the sparc code that was assuming this is not a constant.

Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent eebfcfb5

arch/sparc64/kernel/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm, 
	dev->class = class >> 8;

	dev->revision = class & 0xff;



	sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),

	sprintf(dev->dev.bus_id, "%04x:%02x:%02x.%d", pci_domain_nr(bus),

		dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));



	if (ofpci_verbose)

include/linux/pci.h

+2 −2
Original line number Diff line number Diff line
@@ -996,9 +996,9 @@ static inline void pci_set_drvdata(struct pci_dev *pdev, void *data) 
/* If you want to know what to call your pci_dev, ask this function.

 * Again, it's a wrapper around the generic device.

 */

static inline char *pci_name(struct pci_dev *pdev)

static inline const char *pci_name(struct pci_dev *pdev)

{

	return pdev->dev.bus_id;

	return dev_name(&pdev->dev);

}