diff options
author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2011-03-15 12:08:30 -0400 |
---|---|---|
committer | Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> | 2011-03-15 12:08:24 -0400 |
commit | e6aed122a9185d0fe5890f02ea8efc32c355bc44 (patch) | |
tree | 6d23dcb58c68f979258595b5021e05052767d4e5 /drivers/s390 | |
parent | 085ee9db88bebaadd6d54751b0ced8db486dddfc (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')
-rw-r--r-- | drivers/s390/cio/chsc_sch.c | 6 | ||||
-rw-r--r-- | drivers/s390/cio/css.c | 2 | ||||
-rw-r--r-- | drivers/s390/cio/css.h | 4 | ||||
-rw-r--r-- | drivers/s390/cio/device.c | 6 |
4 files changed, 8 insertions, 10 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[] = { | |||
148 | MODULE_DEVICE_TABLE(css, chsc_subchannel_ids); | 148 | MODULE_DEVICE_TABLE(css, chsc_subchannel_ids); |
149 | 149 | ||
150 | static struct css_driver chsc_subchannel_driver = { | 150 | static 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 | ||
164 | static int __init chsc_init_dbfs(void) | 166 | static int __init chsc_init_dbfs(void) |
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 24d8e97355b9..51eaed0d7662 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
@@ -1233,9 +1233,7 @@ struct bus_type css_bus_type = { | |||
1233 | */ | 1233 | */ |
1234 | int css_driver_register(struct css_driver *cdrv) | 1234 | int css_driver_register(struct css_driver *cdrv) |
1235 | { | 1235 | { |
1236 | cdrv->drv.name = cdrv->name; | ||
1237 | cdrv->drv.bus = &css_bus_type; | 1236 | cdrv->drv.bus = &css_bus_type; |
1238 | cdrv->drv.owner = cdrv->owner; | ||
1239 | return driver_register(&cdrv->drv); | 1237 | return driver_register(&cdrv->drv); |
1240 | } | 1238 | } |
1241 | EXPORT_SYMBOL_GPL(css_driver_register); | 1239 | EXPORT_SYMBOL_GPL(css_driver_register); |
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h index 7e37886de231..566dc1ac425e 100644 --- a/drivers/s390/cio/css.h +++ b/drivers/s390/cio/css.h | |||
@@ -63,7 +63,6 @@ struct subchannel; | |||
63 | struct chp_link; | 63 | struct chp_link; |
64 | /** | 64 | /** |
65 | * struct css_driver - device driver for subchannels | 65 | * struct css_driver - device driver for subchannels |
66 | * @owner: owning module | ||
67 | * @subchannel_type: subchannel type supported by this driver | 66 | * @subchannel_type: subchannel type supported by this driver |
68 | * @drv: embedded device driver structure | 67 | * @drv: embedded device driver structure |
69 | * @irq: called on interrupts | 68 | * @irq: called on interrupts |
@@ -78,10 +77,8 @@ struct chp_link; | |||
78 | * @thaw: undo work done in @freeze | 77 | * @thaw: undo work done in @freeze |
79 | * @restore: callback for restoring after hibernation | 78 | * @restore: callback for restoring after hibernation |
80 | * @settle: wait for asynchronous work to finish | 79 | * @settle: wait for asynchronous work to finish |
81 | * @name: name of the device driver | ||
82 | */ | 80 | */ |
83 | struct css_driver { | 81 | struct css_driver { |
84 | struct module *owner; | ||
85 | struct css_device_id *subchannel_type; | 82 | struct css_device_id *subchannel_type; |
86 | struct device_driver drv; | 83 | struct device_driver drv; |
87 | void (*irq)(struct subchannel *); | 84 | void (*irq)(struct subchannel *); |
@@ -96,7 +93,6 @@ struct css_driver { | |||
96 | int (*thaw) (struct subchannel *); | 93 | int (*thaw) (struct subchannel *); |
97 | int (*restore)(struct subchannel *); | 94 | int (*restore)(struct subchannel *); |
98 | int (*settle)(void); | 95 | int (*settle)(void); |
99 | const char *name; | ||
100 | }; | 96 | }; |
101 | 97 | ||
102 | #define to_cssdriver(n) container_of(n, struct css_driver, drv) | 98 | #define to_cssdriver(n) container_of(n, struct css_driver, drv) |
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 7582a1e35eb8..e50b12163afe 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
@@ -172,9 +172,11 @@ static int io_subchannel_settle(void) | |||
172 | } | 172 | } |
173 | 173 | ||
174 | static struct css_driver io_subchannel_driver = { | 174 | static struct css_driver io_subchannel_driver = { |
175 | .owner = THIS_MODULE, | 175 | .drv = { |
176 | .owner = THIS_MODULE, | ||
177 | .name = "io_subchannel", | ||
178 | }, | ||
176 | .subchannel_type = io_subchannel_ids, | 179 | .subchannel_type = io_subchannel_ids, |
177 | .name = "io_subchannel", | ||
178 | .irq = io_subchannel_irq, | 180 | .irq = io_subchannel_irq, |
179 | .sch_event = io_subchannel_sch_event, | 181 | .sch_event = io_subchannel_sch_event, |
180 | .chp_event = io_subchannel_chp_event, | 182 | .chp_event = io_subchannel_chp_event, |