From: Greg Kroah-Hartman <gregkh@suse.de>

This changes pci_setup_device to handle pci_name() now returning a
constant string.

Cc: Jesse Barns <jbarnes@virtuousgeek.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/pci/probe.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff -puN drivers/pci/probe.c~pci-handle-pci_name-being-const drivers/pci/probe.c
--- a/drivers/pci/probe.c~pci-handle-pci_name-being-const
+++ a/drivers/pci/probe.c
@@ -713,9 +713,9 @@ static int pci_setup_device(struct pci_d
 {
 	u32 class;
 
-	snprintf(dev->dev.bus_id, BUS_ID_SIZE,
-		 "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
-		 dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
+	dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
+		     dev->bus->number, PCI_SLOT(dev->devfn),
+		     PCI_FUNC(dev->devfn));
 
 	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
 	dev->revision = class & 0xff;
_