diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2010-11-15 23:13:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-11-17 14:21:08 -0800 |
| commit | 6b6e39a6a8da7234c538d14c43d3583da8875f9c (patch) | |
| tree | cef5d25998665559ecc0cad2bcdb947cfa401b67 /include/linux/device.h | |
| parent | 14c05aa399e30f343f25158c9adfc44631378a96 (diff) | |
driver-core: merge private parts of class and bus
As classes and busses are pretty much the same thing, and we want to
merge them together into a 'subsystem' in the future, let us share the
same private data parts to make that merge easier.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index dd489531346..1e2d335ab68 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -30,9 +30,8 @@ struct device_private; struct device_driver; struct driver_private; struct class; -struct class_private; +struct subsys_private; struct bus_type; -struct bus_type_private; struct device_node; struct bus_attribute { @@ -65,7 +64,7 @@ struct bus_type { const struct dev_pm_ops *pm; - struct bus_type_private *p; + struct subsys_private *p; }; extern int __must_check bus_register(struct bus_type *bus); @@ -213,7 +212,7 @@ struct class { const struct dev_pm_ops *pm; - struct class_private *p; + struct subsys_private *p; }; struct class_dev_iter { |