aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-07-02 16:24:49 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-07-03 15:30:59 -0400
commiteebfcfb52ce753eaaa8525078bda6b539586066c (patch)
tree8c1c841c5365fe12051a3c1f043bb3c528d50a90 /drivers/pci/probe.c
parent80be038593dba7aa46fb24a14f0ba83e5ade0edb (diff)
PCI: handle pci_name() being const
This changes pci_setup_device to handle pci_name() now returning a constant string. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 0420fd8027b6..2f0ae70710d6 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -713,9 +713,9 @@ static int pci_setup_device(struct pci_dev * dev)
713{ 713{
714 u32 class; 714 u32 class;
715 715
716 snprintf(dev->dev.bus_id, BUS_ID_SIZE, 716 dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
717 "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus), 717 dev->bus->number, PCI_SLOT(dev->devfn),
718 dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); 718 PCI_FUNC(dev->devfn));
719 719
720 pci_read_config_dword(dev, PCI_CLASS_REVISION, &class); 720 pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
721 dev->revision = class & 0xff; 721 dev->revision = class & 0xff;