diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2017-03-16 19:40:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-16 19:56:19 -0400 |
commit | 15c9e10d9ad4d41d076148bbff1de7f659f68852 (patch) | |
tree | 6f4ed9f95626bc1c3e9c8dfc628ac6ed4fee31de | |
parent | 55adc1d05dca9e949cdf46c747cb1e91c0e9143d (diff) |
drivers core: remove assert_held_device_hotplug()
The last caller of assert_held_device_hotplug() is gone, so remove it again.
Link: http://lkml.kernel.org/r/20170314125226.16779-3-heiko.carstens@de.ibm.com
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Dan Williams <dan.j.williams@intel.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Sebastian Ott <sebott@linux.vnet.ibm.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/base/core.c | 5 | ||||
-rw-r--r-- | include/linux/device.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 684bda4d14a1..6bb60fb6a30b 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -639,11 +639,6 @@ int lock_device_hotplug_sysfs(void) | |||
639 | return restart_syscall(); | 639 | return restart_syscall(); |
640 | } | 640 | } |
641 | 641 | ||
642 | void assert_held_device_hotplug(void) | ||
643 | { | ||
644 | lockdep_assert_held(&device_hotplug_lock); | ||
645 | } | ||
646 | |||
647 | #ifdef CONFIG_BLOCK | 642 | #ifdef CONFIG_BLOCK |
648 | static inline int device_is_not_partition(struct device *dev) | 643 | static inline int device_is_not_partition(struct device *dev) |
649 | { | 644 | { |
diff --git a/include/linux/device.h b/include/linux/device.h index 30c4570e928d..9ef518af5515 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -1140,7 +1140,6 @@ static inline bool device_supports_offline(struct device *dev) | |||
1140 | extern void lock_device_hotplug(void); | 1140 | extern void lock_device_hotplug(void); |
1141 | extern void unlock_device_hotplug(void); | 1141 | extern void unlock_device_hotplug(void); |
1142 | extern int lock_device_hotplug_sysfs(void); | 1142 | extern int lock_device_hotplug_sysfs(void); |
1143 | void assert_held_device_hotplug(void); | ||
1144 | extern int device_offline(struct device *dev); | 1143 | extern int device_offline(struct device *dev); |
1145 | extern int device_online(struct device *dev); | 1144 | extern int device_online(struct device *dev); |
1146 | extern void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode); | 1145 | extern void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode); |