diff options
author | Martin Peschke <mp3@de.ibm.com> | 2008-04-18 06:51:55 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-04-18 12:50:17 -0400 |
commit | 1f6f7129ebac007629b28764bfa5147817682692 (patch) | |
tree | 4e0420ff91ed617a97e48b0db81d334e5ba80935 /drivers/s390/scsi/zfcp_ccw.c | |
parent | 99773aab0377ee5bcaf37b7cd2577c3465422dab (diff) |
[SCSI] zfcp: fix 31 bit compile warnings
drivers/s390/scsi/zfcp_aux.c: In function ‘zfcp_fsf_incoming_els_rscn’:
drivers/s390/scsi/zfcp_aux.c:1379: warning: cast from pointer to integer of
different size
drivers/s390/scsi/zfcp_aux.c: In function ‘zfcp_fsf_incoming_els_plogi’:
drivers/s390/scsi/zfcp_aux.c:1432: warning: cast from pointer to integer of
different size
drivers/s390/scsi/zfcp_aux.c: In function ‘zfcp_fsf_incoming_els_logo’:
drivers/s390/scsi/zfcp_aux.c:1457: warning: cast from pointer to integer of
different size
..
Just passing pointers rids us of these warnings and improves readability.
Signed-off-by: Martin Peschke <mp3@de.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/s390/scsi/zfcp_ccw.c')
-rw-r--r-- | drivers/s390/scsi/zfcp_ccw.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c index db9f538362a6..66d3b88844b0 100644 --- a/drivers/s390/scsi/zfcp_ccw.c +++ b/drivers/s390/scsi/zfcp_ccw.c | |||
@@ -170,9 +170,10 @@ zfcp_ccw_set_online(struct ccw_device *ccw_device) | |||
170 | BUG_ON(!zfcp_reqlist_isempty(adapter)); | 170 | BUG_ON(!zfcp_reqlist_isempty(adapter)); |
171 | adapter->req_no = 0; | 171 | adapter->req_no = 0; |
172 | 172 | ||
173 | zfcp_erp_modify_adapter_status(adapter, 10, 0, | 173 | zfcp_erp_modify_adapter_status(adapter, 10, NULL, |
174 | ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET); | 174 | ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET); |
175 | zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED, 85, 0); | 175 | zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED, 85, |
176 | NULL); | ||
176 | zfcp_erp_wait(adapter); | 177 | zfcp_erp_wait(adapter); |
177 | goto out; | 178 | goto out; |
178 | 179 | ||
@@ -197,7 +198,7 @@ zfcp_ccw_set_offline(struct ccw_device *ccw_device) | |||
197 | 198 | ||
198 | down(&zfcp_data.config_sema); | 199 | down(&zfcp_data.config_sema); |
199 | adapter = dev_get_drvdata(&ccw_device->dev); | 200 | adapter = dev_get_drvdata(&ccw_device->dev); |
200 | zfcp_erp_adapter_shutdown(adapter, 0, 86, 0); | 201 | zfcp_erp_adapter_shutdown(adapter, 0, 86, NULL); |
201 | zfcp_erp_wait(adapter); | 202 | zfcp_erp_wait(adapter); |
202 | zfcp_erp_thread_kill(adapter); | 203 | zfcp_erp_thread_kill(adapter); |
203 | up(&zfcp_data.config_sema); | 204 | up(&zfcp_data.config_sema); |
@@ -223,21 +224,21 @@ zfcp_ccw_notify(struct ccw_device *ccw_device, int event) | |||
223 | case CIO_GONE: | 224 | case CIO_GONE: |
224 | ZFCP_LOG_NORMAL("adapter %s: device gone\n", | 225 | ZFCP_LOG_NORMAL("adapter %s: device gone\n", |
225 | zfcp_get_busid_by_adapter(adapter)); | 226 | zfcp_get_busid_by_adapter(adapter)); |
226 | zfcp_erp_adapter_shutdown(adapter, 0, 87, 0); | 227 | zfcp_erp_adapter_shutdown(adapter, 0, 87, NULL); |
227 | break; | 228 | break; |
228 | case CIO_NO_PATH: | 229 | case CIO_NO_PATH: |
229 | ZFCP_LOG_NORMAL("adapter %s: no path\n", | 230 | ZFCP_LOG_NORMAL("adapter %s: no path\n", |
230 | zfcp_get_busid_by_adapter(adapter)); | 231 | zfcp_get_busid_by_adapter(adapter)); |
231 | zfcp_erp_adapter_shutdown(adapter, 0, 88, 0); | 232 | zfcp_erp_adapter_shutdown(adapter, 0, 88, NULL); |
232 | break; | 233 | break; |
233 | case CIO_OPER: | 234 | case CIO_OPER: |
234 | ZFCP_LOG_NORMAL("adapter %s: operational again\n", | 235 | ZFCP_LOG_NORMAL("adapter %s: operational again\n", |
235 | zfcp_get_busid_by_adapter(adapter)); | 236 | zfcp_get_busid_by_adapter(adapter)); |
236 | zfcp_erp_modify_adapter_status(adapter, 11, 0, | 237 | zfcp_erp_modify_adapter_status(adapter, 11, NULL, |
237 | ZFCP_STATUS_COMMON_RUNNING, | 238 | ZFCP_STATUS_COMMON_RUNNING, |
238 | ZFCP_SET); | 239 | ZFCP_SET); |
239 | zfcp_erp_adapter_reopen(adapter, | 240 | zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED, |
240 | ZFCP_STATUS_COMMON_ERP_FAILED, 89, 0); | 241 | 89, NULL); |
241 | break; | 242 | break; |
242 | } | 243 | } |
243 | zfcp_erp_wait(adapter); | 244 | zfcp_erp_wait(adapter); |
@@ -269,7 +270,7 @@ zfcp_ccw_shutdown(struct ccw_device *cdev) | |||
269 | 270 | ||
270 | down(&zfcp_data.config_sema); | 271 | down(&zfcp_data.config_sema); |
271 | adapter = dev_get_drvdata(&cdev->dev); | 272 | adapter = dev_get_drvdata(&cdev->dev); |
272 | zfcp_erp_adapter_shutdown(adapter, 0, 90, 0); | 273 | zfcp_erp_adapter_shutdown(adapter, 0, 90, NULL); |
273 | zfcp_erp_wait(adapter); | 274 | zfcp_erp_wait(adapter); |
274 | up(&zfcp_data.config_sema); | 275 | up(&zfcp_data.config_sema); |
275 | } | 276 | } |