summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGreg KH <gregkh@suse.de>2008-07-03 09:49:39 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-07-07 16:02:40 -0700
commitc6c4f070a61b2b6e5cd317a5fbf25255878688a2 (patch)
tree7831df47d77b4307c91ab0ef8edfd2615271e7d5 /include
parenteebfcfb52ce753eaaa8525078bda6b539586066c (diff)
downloadop-kernel-dev-c6c4f070a61b2b6e5cd317a5fbf25255878688a2.zip
op-kernel-dev-c6c4f070a61b2b6e5cd317a5fbf25255878688a2.tar.gz
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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 96ebaa8..4c80dc3 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);
}
OpenPOWER on IntegriCloud