diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2014-12-03 22:40:27 +0100 |
|---|---|---|
| committer | David Vrabel <david.vrabel@citrix.com> | 2014-12-04 13:41:59 +0100 |
| commit | ac8010221d3fa8697151dfe9a1bb2c504adc68c1 (patch) | |
| tree | 6f29ae15005f635809f6b7be8f964cfce29001ec | |
| parent | xen/pciback: Don't deadlock when unbinding. (diff) | |
| download | linux-ac8010221d3fa8697151dfe9a1bb2c504adc68c1.tar.xz linux-ac8010221d3fa8697151dfe9a1bb2c504adc68c1.zip | |
driver core: Provide an wrapper around the mutex to do lockdep warnings
Instead of open-coding it in drivers that want to double check
that their functions are indeed holding the device lock.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Suggested-by: David Vrabel <david.vrabel@citrix.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
| -rw-r--r-- | drivers/xen/xen-pciback/pci_stub.c | 2 | ||||
| -rw-r--r-- | include/linux/device.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c index 9cbe1a31c1e5..8b77089eddac 100644 --- a/drivers/xen/xen-pciback/pci_stub.c +++ b/drivers/xen/xen-pciback/pci_stub.c @@ -278,7 +278,7 @@ void pcistub_put_pci_dev(struct pci_dev *dev) /* Cleanup our device * (so it's ready for the next domain) */ - lockdep_assert_held(&dev->dev.mutex); + device_lock_assert(&dev->dev); __pci_reset_function_locked(dev); pci_restore_state(dev); diff --git a/include/linux/device.h b/include/linux/device.h index ce1f21608b16..41d6a7555c6b 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -911,6 +911,11 @@ static inline void device_unlock(struct device *dev) mutex_unlock(&dev->mutex); } +static inline void device_lock_assert(struct device *dev) +{ + lockdep_assert_held(&dev->mutex); +} + void driver_init(void); /* |