PCI: make pci_name use dev_name

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

Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 96ebaa8d80e3..4c80dc3f2990 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -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);
 }