Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4beee64685e116b01c47655daf6d88df87e053c8 Commit: 4beee64685e116b01c47655daf6d88df87e053c8 Parent: db6a64238a927777e6e7b251927313f186455b1c Author: Cornelia Huck <[EMAIL PROTECTED]> AuthorDate: Sat Jan 26 14:10:47 2008 +0100 Committer: Martin Schwidefsky <[EMAIL PROTECTED]> CommitDate: Sat Jan 26 14:11:02 2008 +0100
[S390] cio: Set driver->owner on css, ccw and ccwgroup busses. Set the owner field in the embedded struct device_driver to the value provided in the {css,ccw,ccwgroup}_driver. Signed-off-by: Cornelia Huck <[EMAIL PROTECTED]> Signed-off-by: Martin Schwidefsky <[EMAIL PROTECTED]> --- drivers/s390/cio/ccwgroup.c | 1 + drivers/s390/cio/css.c | 1 + drivers/s390/cio/css.h | 1 + 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 b9997fb..dc1c5f4 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) /* register our new driver with the core */ cdriver->driver.bus = &ccwgroup_bus_type; cdriver->driver.name = cdriver->name; + cdriver->driver.owner = cdriver->owner; return driver_register(&cdriver->driver); } diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 4d98a0f..69d56c7 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) { cdrv->drv.name = cdrv->name; cdrv->drv.bus = &css_bus_type; + cdrv->drv.owner = cdrv->owner; return driver_register(&cdrv->drv); } EXPORT_SYMBOL_GPL(css_driver_register); diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h index ee65761..40598b8 100644 --- a/drivers/s390/cio/css.h +++ b/drivers/s390/cio/css.h @@ -65,6 +65,7 @@ struct pgid { */ struct subchannel; struct css_driver { + struct module *owner; unsigned int subchannel_type; struct device_driver drv; void (*irq)(struct subchannel *); diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 933f763..f80d7f5 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -125,6 +125,7 @@ static void io_subchannel_ioterm(struct subchannel *); static void io_subchannel_shutdown(struct subchannel *); static struct css_driver io_subchannel_driver = { + .owner = THIS_MODULE, .subchannel_type = SUBCHANNEL_TYPE_IO, .name = "io_subchannel", .irq = io_subchannel_irq, @@ -1476,6 +1477,7 @@ int ccw_driver_register(struct ccw_driver *cdriver) drv->bus = &ccw_bus_type; drv->name = cdriver->name; + drv->owner = cdriver->owner; return driver_register(drv); } - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html