diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2012-07-03 12:49:35 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 21:05:45 -0400 |
commit | a4232963757e62b3b97bbba07cb92c6d448f6f4b (patch) | |
tree | bf91e17c13821f4463fbae1dc04be0b5e4f9fe7d /include/linux/device.h | |
parent | 8153584e3fdf78753bf653d5f583b6ecb86e5e70 (diff) |
driver-core: Move kobj_to_dev from genhd.h to device.h
This function is not really specific to the genhd layer and there are various
re-implementations or open-coded variants of it all throughout the kernel. To
avoid further duplications move the function to a more generic place.
While moving also convert it from a macro to a inline function.
Potential users of this function can be detected and converted using the
following coccinelle patch:
// <smpl>
@@
expression k;
@@
-container_of(k, struct device, kobj)
+kobj_to_dev(kobj)
// </smpl>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/device.h')
-rw-r--r-- | include/linux/device.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 161d96241b1b..5c4495c8fe3f 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -689,6 +689,11 @@ struct device { | |||
689 | void (*release)(struct device *dev); | 689 | void (*release)(struct device *dev); |
690 | }; | 690 | }; |
691 | 691 | ||
692 | static inline struct device *kobj_to_dev(struct kobject *kobj) | ||
693 | { | ||
694 | return container_of(kobj, struct device, kobj); | ||
695 | } | ||
696 | |||
692 | /* Get the wakeup routines, which depend on struct device */ | 697 | /* Get the wakeup routines, which depend on struct device */ |
693 | #include <linux/pm_wakeup.h> | 698 | #include <linux/pm_wakeup.h> |
694 | 699 | ||