From rmk+greg=kroah.com@arm.linux.org.uk Thu Jan 5 06:43:22 2006 From: Russell King CC: Greg K-H , S390 Subject: [CFT 24/29] Add ccwgroup_bus_type probe and remove methods Date: Thu, 05 Jan 2006 14:42:09 +0000 Message-ID: <20060105142951.13.24@flint.arm.linux.org.uk> Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- drivers/s390/cio/ccwgroup.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) --- gregkh-2.6.orig/drivers/s390/cio/ccwgroup.c +++ gregkh-2.6/drivers/s390/cio/ccwgroup.c @@ -52,11 +52,7 @@ ccwgroup_uevent (struct device *dev, cha return 0; } -static struct bus_type ccwgroup_bus_type = { - .name = "ccwgroup", - .match = ccwgroup_bus_match, - .uevent = ccwgroup_uevent, -}; +static struct bus_type ccwgroup_bus_type; static inline void __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev) @@ -389,6 +385,14 @@ ccwgroup_remove (struct device *dev) return 0; } +static struct bus_type ccwgroup_bus_type = { + .name = "ccwgroup", + .match = ccwgroup_bus_match, + .uevent = ccwgroup_uevent, + .probe = ccwgroup_probe, + .remove = ccwgroup_remove, +}; + int ccwgroup_driver_register (struct ccwgroup_driver *cdriver) { @@ -396,8 +400,6 @@ ccwgroup_driver_register (struct ccwgrou cdriver->driver = (struct device_driver) { .bus = &ccwgroup_bus_type, .name = cdriver->name, - .probe = ccwgroup_probe, - .remove = ccwgroup_remove, }; return driver_register(&cdriver->driver);