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>
This commit is contained in:
parent
80be038593
commit
eebfcfb52c
1 changed files with 3 additions and 3 deletions
|
@ -713,9 +713,9 @@ static int pci_setup_device(struct pci_dev * dev)
|
||||||
{
|
{
|
||||||
u32 class;
|
u32 class;
|
||||||
|
|
||||||
snprintf(dev->dev.bus_id, BUS_ID_SIZE,
|
dev_set_name(&dev->dev, "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
|
||||||
"%04x:%02x:%02x.%d", pci_domain_nr(dev->bus),
|
dev->bus->number, PCI_SLOT(dev->devfn),
|
||||||
dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
|
PCI_FUNC(dev->devfn));
|
||||||
|
|
||||||
pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
|
pci_read_config_dword(dev, PCI_CLASS_REVISION, &class);
|
||||||
dev->revision = class & 0xff;
|
dev->revision = class & 0xff;
|
||||||
|
|
Loading…
Reference in a new issue