浏览代码

[PATCH] Add ccwgroup_bus_type probe and remove methods

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Russell King 19 年之前
父节点
当前提交
f9ccf4569a
共有 1 个文件被更改,包括 9 次插入7 次删除
  1. 9 7
      drivers/s390/cio/ccwgroup.c

+ 9 - 7
drivers/s390/cio/ccwgroup.c

@@ -52,11 +52,7 @@ ccwgroup_uevent (struct device *dev, char **envp, int num_envp, char *buffer,
 	return 0;
 	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
 static inline void
 __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
 __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
@@ -389,6 +385,14 @@ ccwgroup_remove (struct device *dev)
 	return 0;
 	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
 int
 ccwgroup_driver_register (struct ccwgroup_driver *cdriver)
 ccwgroup_driver_register (struct ccwgroup_driver *cdriver)
 {
 {
@@ -396,8 +400,6 @@ ccwgroup_driver_register (struct ccwgroup_driver *cdriver)
 	cdriver->driver = (struct device_driver) {
 	cdriver->driver = (struct device_driver) {
 		.bus = &ccwgroup_bus_type,
 		.bus = &ccwgroup_bus_type,
 		.name = cdriver->name,
 		.name = cdriver->name,
-		.probe = ccwgroup_probe,
-		.remove = ccwgroup_remove,
 	};
 	};
 
 
 	return driver_register(&cdriver->driver);
 	return driver_register(&cdriver->driver);