diff options
author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2011-03-23 05:16:03 -0400 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-03-23 05:15:59 -0400 |
commit | d5ab5276baf9fd8b581cfbf41b10b6d4eae55960 (patch) | |
tree | 7bb0cc557a8c7b2b9ab571acb54a118ef7c2b6a0 /drivers/s390/cio | |
parent | 3bda058b0c39fc72188116d2fd71af08dd0fe5b0 (diff) |
[S390] ccw_bus_type: make it static
Make ccw_bus_type static. ccw_device drivers have to
use ccw_driver_register.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio')
-rw-r--r-- | drivers/s390/cio/device.c | 5 | ||||
-rw-r--r-- | drivers/s390/cio/device.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 334459eb23c8..df14c51f6532 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
@@ -127,7 +127,7 @@ static int ccw_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
127 | return ret; | 127 | return ret; |
128 | } | 128 | } |
129 | 129 | ||
130 | struct bus_type ccw_bus_type; | 130 | static struct bus_type ccw_bus_type; |
131 | 131 | ||
132 | static void io_subchannel_irq(struct subchannel *); | 132 | static void io_subchannel_irq(struct subchannel *); |
133 | static int io_subchannel_probe(struct subchannel *); | 133 | static int io_subchannel_probe(struct subchannel *); |
@@ -1970,7 +1970,7 @@ static const struct dev_pm_ops ccw_pm_ops = { | |||
1970 | .restore = ccw_device_pm_restore, | 1970 | .restore = ccw_device_pm_restore, |
1971 | }; | 1971 | }; |
1972 | 1972 | ||
1973 | struct bus_type ccw_bus_type = { | 1973 | static struct bus_type ccw_bus_type = { |
1974 | .name = "ccw", | 1974 | .name = "ccw", |
1975 | .match = ccw_bus_match, | 1975 | .match = ccw_bus_match, |
1976 | .uevent = ccw_uevent, | 1976 | .uevent = ccw_uevent, |
@@ -2110,5 +2110,4 @@ EXPORT_SYMBOL(ccw_device_set_offline); | |||
2110 | EXPORT_SYMBOL(ccw_driver_register); | 2110 | EXPORT_SYMBOL(ccw_driver_register); |
2111 | EXPORT_SYMBOL(ccw_driver_unregister); | 2111 | EXPORT_SYMBOL(ccw_driver_unregister); |
2112 | EXPORT_SYMBOL(get_ccwdev_by_busid); | 2112 | EXPORT_SYMBOL(get_ccwdev_by_busid); |
2113 | EXPORT_SYMBOL(ccw_bus_type); | ||
2114 | EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id); | 2113 | EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id); |
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h index 379de2d1ec49..7e297c7bb5ff 100644 --- a/drivers/s390/cio/device.h +++ b/drivers/s390/cio/device.h | |||
@@ -133,7 +133,6 @@ void ccw_device_set_notoper(struct ccw_device *cdev); | |||
133 | /* qdio needs this. */ | 133 | /* qdio needs this. */ |
134 | void ccw_device_set_timeout(struct ccw_device *, int); | 134 | void ccw_device_set_timeout(struct ccw_device *, int); |
135 | extern struct subchannel_id ccw_device_get_subchannel_id(struct ccw_device *); | 135 | extern struct subchannel_id ccw_device_get_subchannel_id(struct ccw_device *); |
136 | extern struct bus_type ccw_bus_type; | ||
137 | 136 | ||
138 | /* Channel measurement facility related */ | 137 | /* Channel measurement facility related */ |
139 | void retry_set_schib(struct ccw_device *cdev); | 138 | void retry_set_schib(struct ccw_device *cdev); |