[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>

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 334459eb23c89cb65f0bf65a46a7b7d46bbaea5c..df14c51f653224d37b6ac29c87ad4a778f2b2af9 100644 (file)
--- 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)
        return ret;
 }
 
        return ret;
 }
 

-struct bus_type ccw_bus_type;
+static struct bus_type ccw_bus_type;

 
 static void io_subchannel_irq(struct subchannel *);
 static int io_subchannel_probe(struct subchannel *);
 
 static void io_subchannel_irq(struct subchannel *);
 static int io_subchannel_probe(struct subchannel *);


@@ -1970,7 +1970,7 @@ static const struct dev_pm_ops ccw_pm_ops = {
        .restore = ccw_device_pm_restore,
 };
 
        .restore = ccw_device_pm_restore,
 };
 

-struct bus_type ccw_bus_type = {
+static struct bus_type ccw_bus_type = {

        .name   = "ccw",
        .match  = ccw_bus_match,
        .uevent = ccw_uevent,
        .name   = "ccw",
        .match  = ccw_bus_match,
        .uevent = ccw_uevent,


@@ -2110,5 +2110,4 @@ EXPORT_SYMBOL(ccw_device_set_offline);
 EXPORT_SYMBOL(ccw_driver_register);
 EXPORT_SYMBOL(ccw_driver_unregister);
 EXPORT_SYMBOL(get_ccwdev_by_busid);
 EXPORT_SYMBOL(ccw_driver_register);
 EXPORT_SYMBOL(ccw_driver_unregister);
 EXPORT_SYMBOL(get_ccwdev_by_busid);

-EXPORT_SYMBOL(ccw_bus_type);

 EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id);
 EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id);

diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 379de2d1ec496a3895f42946b8080d99f88d1a71..7e297c7bb5fffe7ed6b719279923efb098c98b71 100644 (file)
--- 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);
 /* qdio needs this. */
 void ccw_device_set_timeout(struct ccw_device *, int);
 extern struct subchannel_id ccw_device_get_subchannel_id(struct ccw_device *);
 /* qdio needs this. */
 void ccw_device_set_timeout(struct ccw_device *, int);
 extern struct subchannel_id ccw_device_get_subchannel_id(struct ccw_device *);

-extern struct bus_type ccw_bus_type;

 
 /* Channel measurement facility related */
 void retry_set_schib(struct ccw_device *cdev);
 
 /* Channel measurement facility related */
 void retry_set_schib(struct ccw_device *cdev);