Commit 4beee646 authored by Cornelia Huck's avatar Cornelia Huck Committed by Martin Schwidefsky
Browse files

[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: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent db6a6423

drivers/s390/cio/ccwgroup.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}

drivers/s390/cio/css.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

drivers/s390/cio/css.h

+1 −0
Original line number Diff line number Diff line
@@ -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 *);

drivers/s390/cio/device.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

}