diff options
| -rw-r--r-- | drivers/pci/probe.c | 7 | ||||
| -rw-r--r-- | include/linux/pci.h | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 8e696e547565..15168881ec94 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2533,6 +2533,8 @@ static void pci_set_msi_domain(struct pci_dev *dev) dev_set_msi_domain(&dev->dev, d); } +static struct lock_class_key cfg_access_key; + void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) { int ret; @@ -2546,9 +2548,8 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) dev->dev.dma_mask = &dev->dma_mask; dev->dev.dma_parms = &dev->dma_parms; dev->dev.coherent_dma_mask = 0xffffffffull; - lockdep_register_key(&dev->cfg_access_key); - lockdep_init_map(&dev->cfg_access_lock, dev_name(&dev->dev), - &dev->cfg_access_key, 0); + lockdep_init_map(&dev->cfg_access_lock, "&dev->cfg_access_lock", + &cfg_access_key, 0); dma_set_max_seg_size(&dev->dev, 65536); dma_set_seg_boundary(&dev->dev, 0xffffffff); diff --git a/include/linux/pci.h b/include/linux/pci.h index fb004fd4e889..5bece7fd11f8 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -413,7 +413,6 @@ struct pci_dev { struct resource driver_exclusive_resource; /* driver exclusive resource ranges */ bool match_driver; /* Skip attaching driver */ - struct lock_class_key cfg_access_key; struct lockdep_map cfg_access_lock; unsigned int transparent:1; /* Subtractive decode bridge */ |