aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/chsc_sch.c
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2011-03-15 12:08:30 -0400
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2011-03-15 12:08:24 -0400
commite6aed122a9185d0fe5890f02ea8efc32c355bc44 (patch)
tree6d23dcb58c68f979258595b5021e05052767d4e5 /drivers/s390/cio/chsc_sch.c
parent085ee9db88bebaadd6d54751b0ced8db486dddfc (diff)
[S390] css_driver: remove duplicate members
Remove the owner and name members of struct css_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>
Diffstat (limited to 'drivers/s390/cio/chsc_sch.c')
-rw-r--r--drivers/s390/cio/chsc_sch.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c
index 09c2ea84a57f..e950f1ad4dd1 100644
--- a/drivers/s390/cio/chsc_sch.c
+++ b/drivers/s390/cio/chsc_sch.c
@@ -148,7 +148,10 @@ static struct css_device_id chsc_subchannel_ids[] = {
148MODULE_DEVICE_TABLE(css, chsc_subchannel_ids); 148MODULE_DEVICE_TABLE(css, chsc_subchannel_ids);
149 149
150static struct css_driver chsc_subchannel_driver = { 150static struct css_driver chsc_subchannel_driver = {
151 .owner = THIS_MODULE, 151 .drv = {
152 .owner = THIS_MODULE,
153 .name = "chsc_subchannel",
154 },
152 .subchannel_type = chsc_subchannel_ids, 155 .subchannel_type = chsc_subchannel_ids,
153 .irq = chsc_subchannel_irq, 156 .irq = chsc_subchannel_irq,
154 .probe = chsc_subchannel_probe, 157 .probe = chsc_subchannel_probe,
@@ -158,7 +161,6 @@ static struct css_driver chsc_subchannel_driver = {
158 .freeze = chsc_subchannel_freeze, 161 .freeze = chsc_subchannel_freeze,
159 .thaw = chsc_subchannel_restore, 162 .thaw = chsc_subchannel_restore,
160 .restore = chsc_subchannel_restore, 163 .restore = chsc_subchannel_restore,
161 .name = "chsc_subchannel",
162}; 164};
163 165
164static int __init chsc_init_dbfs(void) 166static int __init chsc_init_dbfs(void)