diff options
| author | Greg Kroah-Hartman | 2008-07-02 22:24:49 +0200 |
|---|---|---|
| committer | Jesse Barnes | 2008-07-03 21:30:59 +0200 |
| commit | eebfcfb52ce753eaaa8525078bda6b539586066c (patch) | |
| tree | 8c1c841c5365fe12051a3c1f043bb3c528d50a90 /drivers/pci | |
| parent | PCI: add stub for pci_set_consistent_dma_mask() (diff) | |
| download | kernel-qcow2-linux-eebfcfb52ce753eaaa8525078bda6b539586066c.tar.gz kernel-qcow2-linux-eebfcfb52ce753eaaa8525078bda6b539586066c.tar.xz kernel-qcow2-linux-eebfcfb52ce753eaaa8525078bda6b539586066c.zip | |
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')
| -rw-r--r-- | drivers/pci/probe.c | 6 |
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) { 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; |