[S390] ccw_driver: remove duplicate members

Remove the owner and name members of struct ccw_driver and convert all drivers to store this data in the embedded struct device_driver. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

[S390] ccw_driver: remove duplicate members
Remove the owner and name members of struct ccw_driver and convert all drivers to store this data in the embedded struct device_driver. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Sebastian Ott · Martin Schwidefsky
1 parent 9a26513eb6
Showing 14 changed files with 49 additions and 31 deletions Side-by-side Diff
arch/s390/include/asm/ccwdev.h
drivers/s390/block/dasd_eckd.c
drivers/s390/block/dasd_fba.c
drivers/s390/char/con3215.c
drivers/s390/char/raw3270.c
drivers/s390/char/tape_34xx.c
drivers/s390/char/tape_3590.c
drivers/s390/char/vmur.c
drivers/s390/cio/device.c
drivers/s390/net/claw.c
drivers/s390/net/ctcm_main.c
drivers/s390/net/lcs.c
drivers/s390/net/qeth_core_main.c
drivers/s390/scsi/zfcp_ccw.c
@@ -112,7 +112,6 @@
  
 /**
  * struct ccw driver - device driver for channel attached devices
- * @owner: owning module
  * @ids: ids supported by this driver
  * @probe: function called on probe
  * @remove: function called on remove
  
@@ -128,10 +127,8 @@
  * @restore: callback for restoring after hibernation
  * @uc_handler: callback for unit check handler
  * @driver: embedded device driver structure
- * @name: device driver name
  */
 struct ccw_driver {
-	struct module *owner;
 	struct ccw_device_id *ids;
 	int (*probe) (struct ccw_device *);
 	void (*remove) (struct ccw_device *);
@@ -147,7 +144,6 @@
 	int (*restore)(struct ccw_device *);
 	enum uc_todo (*uc_handler) (struct ccw_device *, struct irb *);
 	struct device_driver driver;
-	char *name;
 };
  
 extern struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv,
@@ -3982,8 +3982,10 @@
 }
  
 static struct ccw_driver dasd_eckd_driver = {
-	.name	     = "dasd-eckd",
-	.owner	     = THIS_MODULE,
+	.driver = {
+		.name	= "dasd-eckd",
+		.owner	= THIS_MODULE,
+	},
 	.ids	     = dasd_eckd_ids,
 	.probe	     = dasd_eckd_probe,
 	.remove      = dasd_generic_remove,
@@ -65,8 +65,10 @@
 }
  
 static struct ccw_driver dasd_fba_driver = {
-	.name        = "dasd-fba",
-	.owner       = THIS_MODULE,
+	.driver = {
+		.name	= "dasd-fba",
+		.owner	= THIS_MODULE,
+	},
 	.ids         = dasd_fba_ids,
 	.probe       = dasd_fba_probe,
 	.remove      = dasd_generic_remove,
@@ -764,8 +764,10 @@
 };
  
 static struct ccw_driver raw3215_ccw_driver = {
-	.name		= "3215",
-	.owner		= THIS_MODULE,
+	.driver = {
+		.name	= "3215",
+		.owner	= THIS_MODULE,
+	},
 	.ids		= raw3215_id,
 	.probe		= &raw3215_probe,
 	.remove		= &raw3215_remove,
@@ -1388,8 +1388,10 @@
 };
  
 static struct ccw_driver raw3270_ccw_driver = {
-	.name		= "3270",
-	.owner		= THIS_MODULE,
+	.driver = {
+		.name	= "3270",
+		.owner	= THIS_MODULE,
+	},
 	.ids		= raw3270_id,
 	.probe		= &raw3270_probe,
 	.remove		= &raw3270_remove,
@@ -1320,8 +1320,10 @@
 }
  
 static struct ccw_driver tape_34xx_driver = {
-	.name = "tape_34xx",
-	.owner = THIS_MODULE,
+	.driver = {
+		.name = "tape_34xx",
+		.owner = THIS_MODULE,
+	},
 	.ids = tape_34xx_ids,
 	.probe = tape_generic_probe,
 	.remove = tape_generic_remove,
@@ -1761,8 +1761,10 @@
 }
  
 static struct ccw_driver tape_3590_driver = {
-	.name = "tape_3590",
-	.owner = THIS_MODULE,
+	.driver = {
+		.name = "tape_3590",
+		.owner = THIS_MODULE,
+	},
 	.ids = tape_3590_ids,
 	.probe = tape_generic_probe,
 	.remove = tape_generic_remove,
@@ -64,8 +64,10 @@
 static int ur_pm_suspend(struct ccw_device *cdev);
  
 static struct ccw_driver ur_driver = {
-	.name		= "vmur",
-	.owner		= THIS_MODULE,
+	.driver = {
+		.name	= "vmur",
+		.owner	= THIS_MODULE,
+	},
 	.ids		= ur_ids,
 	.probe		= ur_probe,
 	.remove		= ur_remove,
@@ -547,7 +547,7 @@
 	if (atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)
 		return -EAGAIN;
  
-	if (cdev->drv && !try_module_get(cdev->drv->owner)) {
+	if (cdev->drv && !try_module_get(cdev->drv->driver.owner)) {
 		atomic_set(&cdev->private->onoff, 0);
 		return -EINVAL;
 	}
@@ -573,7 +573,7 @@
 	}
 out:
 	if (cdev->drv)
-		module_put(cdev->drv->owner);
+		module_put(cdev->drv->driver.owner);
 	atomic_set(&cdev->private->onoff, 0);
 	return (ret < 0) ? ret : count;
 }
@@ -1993,8 +1993,6 @@
 	struct device_driver *drv = &cdriver->driver;
  
 	drv->bus = &ccw_bus_type;
-	drv->name = cdriver->name;
-	drv->owner = cdriver->owner;
  
 	return driver_register(drv);
 }
@@ -282,8 +282,10 @@
 MODULE_DEVICE_TABLE(ccw, claw_ids);
  
 static struct ccw_driver claw_ccw_driver = {
-	.owner	= THIS_MODULE,
-	.name	= "claw",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "claw",
+	},
 	.ids	= claw_ids,
 	.probe	= ccwgroup_probe_ccwdev,
 	.remove	= ccwgroup_remove_ccwdev,
@@ -1764,8 +1764,10 @@
 MODULE_DEVICE_TABLE(ccw, ctcm_ids);
  
 static struct ccw_driver ctcm_ccw_driver = {
-	.owner	= THIS_MODULE,
-	.name	= "ctcm",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "ctcm",
+	},
 	.ids	= ctcm_ids,
 	.probe	= ccwgroup_probe_ccwdev,
 	.remove	= ccwgroup_remove_ccwdev,
@@ -2396,8 +2396,10 @@
 MODULE_DEVICE_TABLE(ccw, lcs_ids);
  
 static struct ccw_driver lcs_ccw_driver = {
-	.owner	= THIS_MODULE,
-	.name	= "lcs",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "lcs",
+	},
 	.ids	= lcs_ids,
 	.probe	= ccwgroup_probe_ccwdev,
 	.remove	= ccwgroup_remove_ccwdev,
@@ -3902,7 +3902,9 @@
 MODULE_DEVICE_TABLE(ccw, qeth_ids);
  
 static struct ccw_driver qeth_ccw_driver = {
-	.name = "qeth",
+	.driver = {
+		.name = "qeth",
+	},
 	.ids = qeth_ids,
 	.probe = ccwgroup_probe_ccwdev,
 	.remove = ccwgroup_remove_ccwdev,
@@ -251,8 +251,10 @@
 }
  
 struct ccw_driver zfcp_ccw_driver = {
-	.owner       = THIS_MODULE,
-	.name        = "zfcp",
+	.driver = {
+		.owner	= THIS_MODULE,
+		.name	= "zfcp",
+	},
 	.ids         = zfcp_ccw_device_id,
 	.probe       = zfcp_ccw_probe,
 	.remove      = zfcp_ccw_remove,
...	...	@@ -112,7 +112,6 @@
112	112
113	113	/**
114	114	* struct ccw driver - device driver for channel attached devices
115		- * @owner: owning module
116	115	* @ids: ids supported by this driver
117	116	* @probe: function called on probe
118	117	* @remove: function called on remove
119	118
...	...	@@ -128,10 +127,8 @@
128	127	* @restore: callback for restoring after hibernation
129	128	* @uc_handler: callback for unit check handler
130	129	* @driver: embedded device driver structure
131		- * @name: device driver name
132	130	*/
133	131	struct ccw_driver {
134		- struct module *owner;
135	132	struct ccw_device_id *ids;
136	133	int (probe) (struct ccw_device );
137	134	void (remove) (struct ccw_device );
...	...	@@ -147,7 +144,6 @@
147	144	int (restore)(struct ccw_device );
148	145	enum uc_todo (uc_handler) (struct ccw_device , struct irb *);
149	146	struct device_driver driver;
150		- char *name;
151	147	};
152	148
153	149	extern struct ccw_device get_ccwdev_by_busid(struct ccw_driver cdrv,
...	...	@@ -3982,8 +3982,10 @@
3982	3982	}
3983	3983
3984	3984	static struct ccw_driver dasd_eckd_driver = {
3985		- .name = "dasd-eckd",
3986		- .owner = THIS_MODULE,
	3985	+ .driver = {
	3986	+ .name = "dasd-eckd",
	3987	+ .owner = THIS_MODULE,
	3988	+ },
3987	3989	.ids = dasd_eckd_ids,
3988	3990	.probe = dasd_eckd_probe,
3989	3991	.remove = dasd_generic_remove,
...	...	@@ -65,8 +65,10 @@
65	65	}
66	66
67	67	static struct ccw_driver dasd_fba_driver = {
68		- .name = "dasd-fba",
69		- .owner = THIS_MODULE,
	68	+ .driver = {
	69	+ .name = "dasd-fba",
	70	+ .owner = THIS_MODULE,
	71	+ },
70	72	.ids = dasd_fba_ids,
71	73	.probe = dasd_fba_probe,
72	74	.remove = dasd_generic_remove,
...	...	@@ -764,8 +764,10 @@
764	764	};
765	765
766	766	static struct ccw_driver raw3215_ccw_driver = {
767		- .name = "3215",
768		- .owner = THIS_MODULE,
	767	+ .driver = {
	768	+ .name = "3215",
	769	+ .owner = THIS_MODULE,
	770	+ },
769	771	.ids = raw3215_id,
770	772	.probe = &raw3215_probe,
771	773	.remove = &raw3215_remove,
...	...	@@ -1388,8 +1388,10 @@
1388	1388	};
1389	1389
1390	1390	static struct ccw_driver raw3270_ccw_driver = {
1391		- .name = "3270",
1392		- .owner = THIS_MODULE,
	1391	+ .driver = {
	1392	+ .name = "3270",
	1393	+ .owner = THIS_MODULE,
	1394	+ },
1393	1395	.ids = raw3270_id,
1394	1396	.probe = &raw3270_probe,
1395	1397	.remove = &raw3270_remove,
...	...	@@ -1320,8 +1320,10 @@
1320	1320	}
1321	1321
1322	1322	static struct ccw_driver tape_34xx_driver = {
1323		- .name = "tape_34xx",
1324		- .owner = THIS_MODULE,
	1323	+ .driver = {
	1324	+ .name = "tape_34xx",
	1325	+ .owner = THIS_MODULE,
	1326	+ },
1325	1327	.ids = tape_34xx_ids,
1326	1328	.probe = tape_generic_probe,
1327	1329	.remove = tape_generic_remove,
...	...	@@ -1761,8 +1761,10 @@
1761	1761	}
1762	1762
1763	1763	static struct ccw_driver tape_3590_driver = {
1764		- .name = "tape_3590",
1765		- .owner = THIS_MODULE,
	1764	+ .driver = {
	1765	+ .name = "tape_3590",
	1766	+ .owner = THIS_MODULE,
	1767	+ },
1766	1768	.ids = tape_3590_ids,
1767	1769	.probe = tape_generic_probe,
1768	1770	.remove = tape_generic_remove,
...	...	@@ -64,8 +64,10 @@
64	64	static int ur_pm_suspend(struct ccw_device *cdev);
65	65
66	66	static struct ccw_driver ur_driver = {
67		- .name = "vmur",
68		- .owner = THIS_MODULE,
	67	+ .driver = {
	68	+ .name = "vmur",
	69	+ .owner = THIS_MODULE,
	70	+ },
69	71	.ids = ur_ids,
70	72	.probe = ur_probe,
71	73	.remove = ur_remove,
...	...	@@ -547,7 +547,7 @@
547	547	if (atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)
548	548	return -EAGAIN;
549	549
550		- if (cdev->drv && !try_module_get(cdev->drv->owner)) {
	550	+ if (cdev->drv && !try_module_get(cdev->drv->driver.owner)) {
551	551	atomic_set(&cdev->private->onoff, 0);
552	552	return -EINVAL;
553	553	}
...	...	@@ -573,7 +573,7 @@
573	573	}
574	574	out:
575	575	if (cdev->drv)
576		- module_put(cdev->drv->owner);
	576	+ module_put(cdev->drv->driver.owner);
577	577	atomic_set(&cdev->private->onoff, 0);
578	578	return (ret < 0) ? ret : count;
579	579	}
...	...	@@ -1993,8 +1993,6 @@
1993	1993	struct device_driver *drv = &cdriver->driver;
1994	1994
1995	1995	drv->bus = &ccw_bus_type;
1996		- drv->name = cdriver->name;
1997		- drv->owner = cdriver->owner;
1998	1996
1999	1997	return driver_register(drv);
2000	1998	}
...	...	@@ -282,8 +282,10 @@
282	282	MODULE_DEVICE_TABLE(ccw, claw_ids);
283	283
284	284	static struct ccw_driver claw_ccw_driver = {
285		- .owner = THIS_MODULE,
286		- .name = "claw",
	285	+ .driver = {
	286	+ .owner = THIS_MODULE,
	287	+ .name = "claw",
	288	+ },
287	289	.ids = claw_ids,
288	290	.probe = ccwgroup_probe_ccwdev,
289	291	.remove = ccwgroup_remove_ccwdev,