diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/s390/cio/ccwgroup.c | 1 | ||||
-rw-r--r-- | drivers/s390/cio/css.c | 1 | ||||
-rw-r--r-- | drivers/s390/cio/css.h | 1 | ||||
-rw-r--r-- | drivers/s390/cio/device.c | 2 |
4 files changed, 5 insertions, 0 deletions
diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c index b9997fb4883c..dc1c5f4dd256 100644 --- a/drivers/s390/cio/ccwgroup.c +++ b/drivers/s390/cio/ccwgroup.c | |||
@@ -408,6 +408,7 @@ int ccwgroup_driver_register(struct ccwgroup_driver *cdriver) | |||
408 | /* register our new driver with the core */ | 408 | /* register our new driver with the core */ |
409 | cdriver->driver.bus = &ccwgroup_bus_type; | 409 | cdriver->driver.bus = &ccwgroup_bus_type; |
410 | cdriver->driver.name = cdriver->name; | 410 | cdriver->driver.name = cdriver->name; |
411 | cdriver->driver.owner = cdriver->owner; | ||
411 | 412 | ||
412 | return driver_register(&cdriver->driver); | 413 | return driver_register(&cdriver->driver); |
413 | } | 414 | } |
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 4d98a0fddedf..69d56c7284d1 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
@@ -862,6 +862,7 @@ int css_driver_register(struct css_driver *cdrv) | |||
862 | { | 862 | { |
863 | cdrv->drv.name = cdrv->name; | 863 | cdrv->drv.name = cdrv->name; |
864 | cdrv->drv.bus = &css_bus_type; | 864 | cdrv->drv.bus = &css_bus_type; |
865 | cdrv->drv.owner = cdrv->owner; | ||
865 | return driver_register(&cdrv->drv); | 866 | return driver_register(&cdrv->drv); |
866 | } | 867 | } |
867 | EXPORT_SYMBOL_GPL(css_driver_register); | 868 | EXPORT_SYMBOL_GPL(css_driver_register); |
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h index ee65761e8254..40598b8ee27d 100644 --- a/drivers/s390/cio/css.h +++ b/drivers/s390/cio/css.h | |||
@@ -65,6 +65,7 @@ struct pgid { | |||
65 | */ | 65 | */ |
66 | struct subchannel; | 66 | struct subchannel; |
67 | struct css_driver { | 67 | struct css_driver { |
68 | struct module *owner; | ||
68 | unsigned int subchannel_type; | 69 | unsigned int subchannel_type; |
69 | struct device_driver drv; | 70 | struct device_driver drv; |
70 | void (*irq)(struct subchannel *); | 71 | void (*irq)(struct subchannel *); |
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 933f763e9586..f80d7f5418d3 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
@@ -125,6 +125,7 @@ static void io_subchannel_ioterm(struct subchannel *); | |||
125 | static void io_subchannel_shutdown(struct subchannel *); | 125 | static void io_subchannel_shutdown(struct subchannel *); |
126 | 126 | ||
127 | static struct css_driver io_subchannel_driver = { | 127 | static struct css_driver io_subchannel_driver = { |
128 | .owner = THIS_MODULE, | ||
128 | .subchannel_type = SUBCHANNEL_TYPE_IO, | 129 | .subchannel_type = SUBCHANNEL_TYPE_IO, |
129 | .name = "io_subchannel", | 130 | .name = "io_subchannel", |
130 | .irq = io_subchannel_irq, | 131 | .irq = io_subchannel_irq, |
@@ -1476,6 +1477,7 @@ int ccw_driver_register(struct ccw_driver *cdriver) | |||
1476 | 1477 | ||
1477 | drv->bus = &ccw_bus_type; | 1478 | drv->bus = &ccw_bus_type; |
1478 | drv->name = cdriver->name; | 1479 | drv->name = cdriver->name; |
1480 | drv->owner = cdriver->owner; | ||
1479 | 1481 | ||
1480 | return driver_register(drv); | 1482 | return driver_register(drv); |
1481 | } | 1483 | } |