aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/device_fsm.c
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2006-10-11 09:31:47 -0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2006-10-11 09:31:47 -0400
commit12975aef62836e9f3e179afaaded8045f8a25ac4 (patch)
tree719a2622de3bd09d11372b535a7fba98aeedb50e /drivers/s390/cio/device_fsm.c
parente7769b48a0216d7262fe2ba59b1b3697be462cbb (diff)
[S390] cio: remove casts from/to (void *).
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/device_fsm.c')
-rw-r--r--drivers/s390/cio/device_fsm.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 44e4a53c5981..fcaf28d7b4eb 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -173,7 +173,7 @@ ccw_device_handle_oper(struct ccw_device *cdev)
173 cdev->id.dev_model != cdev->private->senseid.dev_model || 173 cdev->id.dev_model != cdev->private->senseid.dev_model ||
174 cdev->private->dev_id.devno != sch->schib.pmcw.dev) { 174 cdev->private->dev_id.devno != sch->schib.pmcw.dev) {
175 PREPARE_WORK(&cdev->private->kick_work, 175 PREPARE_WORK(&cdev->private->kick_work,
176 ccw_device_do_unreg_rereg, (void *)cdev); 176 ccw_device_do_unreg_rereg, cdev);
177 queue_work(ccw_device_work, &cdev->private->kick_work); 177 queue_work(ccw_device_work, &cdev->private->kick_work);
178 return 0; 178 return 0;
179 } 179 }
@@ -314,13 +314,13 @@ ccw_device_oper_notify(void *data)
314 struct subchannel *sch; 314 struct subchannel *sch;
315 int ret; 315 int ret;
316 316
317 cdev = (struct ccw_device *)data; 317 cdev = data;
318 sch = to_subchannel(cdev->dev.parent); 318 sch = to_subchannel(cdev->dev.parent);
319 ret = (sch->driver && sch->driver->notify) ? 319 ret = (sch->driver && sch->driver->notify) ?
320 sch->driver->notify(&sch->dev, CIO_OPER) : 0; 320 sch->driver->notify(&sch->dev, CIO_OPER) : 0;
321 if (!ret) 321 if (!ret)
322 /* Driver doesn't want device back. */ 322 /* Driver doesn't want device back. */
323 ccw_device_do_unreg_rereg((void *)cdev); 323 ccw_device_do_unreg_rereg(cdev);
324 else { 324 else {
325 /* Reenable channel measurements, if needed. */ 325 /* Reenable channel measurements, if needed. */
326 cmf_reenable(cdev); 326 cmf_reenable(cdev);
@@ -357,7 +357,7 @@ ccw_device_done(struct ccw_device *cdev, int state)
357 if (cdev->private->flags.donotify) { 357 if (cdev->private->flags.donotify) {
358 cdev->private->flags.donotify = 0; 358 cdev->private->flags.donotify = 0;
359 PREPARE_WORK(&cdev->private->kick_work, ccw_device_oper_notify, 359 PREPARE_WORK(&cdev->private->kick_work, ccw_device_oper_notify,
360 (void *)cdev); 360 cdev);
361 queue_work(ccw_device_notify_work, &cdev->private->kick_work); 361 queue_work(ccw_device_notify_work, &cdev->private->kick_work);
362 } 362 }
363 wake_up(&cdev->private->wait_q); 363 wake_up(&cdev->private->wait_q);
@@ -513,7 +513,7 @@ ccw_device_nopath_notify(void *data)
513 struct subchannel *sch; 513 struct subchannel *sch;
514 int ret; 514 int ret;
515 515
516 cdev = (struct ccw_device *)data; 516 cdev = data;
517 sch = to_subchannel(cdev->dev.parent); 517 sch = to_subchannel(cdev->dev.parent);
518 /* Extra sanity. */ 518 /* Extra sanity. */
519 if (sch->lpm) 519 if (sch->lpm)
@@ -527,7 +527,7 @@ ccw_device_nopath_notify(void *data)
527 if (get_device(&cdev->dev)) { 527 if (get_device(&cdev->dev)) {
528 PREPARE_WORK(&cdev->private->kick_work, 528 PREPARE_WORK(&cdev->private->kick_work,
529 ccw_device_call_sch_unregister, 529 ccw_device_call_sch_unregister,
530 (void *)cdev); 530 cdev);
531 queue_work(ccw_device_work, 531 queue_work(ccw_device_work,
532 &cdev->private->kick_work); 532 &cdev->private->kick_work);
533 } else 533 } else
@@ -582,7 +582,7 @@ ccw_device_verify_done(struct ccw_device *cdev, int err)
582 break; 582 break;
583 default: 583 default:
584 PREPARE_WORK(&cdev->private->kick_work, 584 PREPARE_WORK(&cdev->private->kick_work,
585 ccw_device_nopath_notify, (void *)cdev); 585 ccw_device_nopath_notify, cdev);
586 queue_work(ccw_device_notify_work, &cdev->private->kick_work); 586 queue_work(ccw_device_notify_work, &cdev->private->kick_work);
587 ccw_device_done(cdev, DEV_STATE_NOT_OPER); 587 ccw_device_done(cdev, DEV_STATE_NOT_OPER);
588 break; 588 break;
@@ -713,7 +713,7 @@ ccw_device_offline_notoper(struct ccw_device *cdev, enum dev_event dev_event)
713 sch = to_subchannel(cdev->dev.parent); 713 sch = to_subchannel(cdev->dev.parent);
714 if (get_device(&cdev->dev)) { 714 if (get_device(&cdev->dev)) {
715 PREPARE_WORK(&cdev->private->kick_work, 715 PREPARE_WORK(&cdev->private->kick_work,
716 ccw_device_call_sch_unregister, (void *)cdev); 716 ccw_device_call_sch_unregister, cdev);
717 queue_work(ccw_device_work, &cdev->private->kick_work); 717 queue_work(ccw_device_work, &cdev->private->kick_work);
718 } 718 }
719 wake_up(&cdev->private->wait_q); 719 wake_up(&cdev->private->wait_q);
@@ -744,7 +744,7 @@ ccw_device_online_notoper(struct ccw_device *cdev, enum dev_event dev_event)
744 } 744 }
745 if (get_device(&cdev->dev)) { 745 if (get_device(&cdev->dev)) {
746 PREPARE_WORK(&cdev->private->kick_work, 746 PREPARE_WORK(&cdev->private->kick_work,
747 ccw_device_call_sch_unregister, (void *)cdev); 747 ccw_device_call_sch_unregister, cdev);
748 queue_work(ccw_device_work, &cdev->private->kick_work); 748 queue_work(ccw_device_work, &cdev->private->kick_work);
749 } 749 }
750 wake_up(&cdev->private->wait_q); 750 wake_up(&cdev->private->wait_q);
@@ -849,7 +849,7 @@ ccw_device_online_timeout(struct ccw_device *cdev, enum dev_event dev_event)
849 sch = to_subchannel(cdev->dev.parent); 849 sch = to_subchannel(cdev->dev.parent);
850 if (!sch->lpm) { 850 if (!sch->lpm) {
851 PREPARE_WORK(&cdev->private->kick_work, 851 PREPARE_WORK(&cdev->private->kick_work,
852 ccw_device_nopath_notify, (void *)cdev); 852 ccw_device_nopath_notify, cdev);
853 queue_work(ccw_device_notify_work, 853 queue_work(ccw_device_notify_work,
854 &cdev->private->kick_work); 854 &cdev->private->kick_work);
855 } else 855 } else
@@ -938,7 +938,7 @@ ccw_device_killing_irq(struct ccw_device *cdev, enum dev_event dev_event)
938 ERR_PTR(-EIO)); 938 ERR_PTR(-EIO));
939 if (!sch->lpm) { 939 if (!sch->lpm) {
940 PREPARE_WORK(&cdev->private->kick_work, 940 PREPARE_WORK(&cdev->private->kick_work,
941 ccw_device_nopath_notify, (void *)cdev); 941 ccw_device_nopath_notify, cdev);
942 queue_work(ccw_device_notify_work, &cdev->private->kick_work); 942 queue_work(ccw_device_notify_work, &cdev->private->kick_work);
943 } else if (cdev->private->flags.doverify) 943 } else if (cdev->private->flags.doverify)
944 /* Start delayed path verification. */ 944 /* Start delayed path verification. */
@@ -961,7 +961,7 @@ ccw_device_killing_timeout(struct ccw_device *cdev, enum dev_event dev_event)
961 sch = to_subchannel(cdev->dev.parent); 961 sch = to_subchannel(cdev->dev.parent);
962 if (!sch->lpm) { 962 if (!sch->lpm) {
963 PREPARE_WORK(&cdev->private->kick_work, 963 PREPARE_WORK(&cdev->private->kick_work,
964 ccw_device_nopath_notify, (void *)cdev); 964 ccw_device_nopath_notify, cdev);
965 queue_work(ccw_device_notify_work, 965 queue_work(ccw_device_notify_work,
966 &cdev->private->kick_work); 966 &cdev->private->kick_work);
967 } else 967 } else
@@ -990,7 +990,7 @@ void device_kill_io(struct subchannel *sch)
990 if (ret == -ENODEV) { 990 if (ret == -ENODEV) {
991 if (!sch->lpm) { 991 if (!sch->lpm) {
992 PREPARE_WORK(&cdev->private->kick_work, 992 PREPARE_WORK(&cdev->private->kick_work,
993 ccw_device_nopath_notify, (void *)cdev); 993 ccw_device_nopath_notify, cdev);
994 queue_work(ccw_device_notify_work, 994 queue_work(ccw_device_notify_work,
995 &cdev->private->kick_work); 995 &cdev->private->kick_work);
996 } else 996 } else
@@ -1002,7 +1002,7 @@ void device_kill_io(struct subchannel *sch)
1002 ERR_PTR(-EIO)); 1002 ERR_PTR(-EIO));
1003 if (!sch->lpm) { 1003 if (!sch->lpm) {
1004 PREPARE_WORK(&cdev->private->kick_work, 1004 PREPARE_WORK(&cdev->private->kick_work,
1005 ccw_device_nopath_notify, (void *)cdev); 1005 ccw_device_nopath_notify, cdev);
1006 queue_work(ccw_device_notify_work, &cdev->private->kick_work); 1006 queue_work(ccw_device_notify_work, &cdev->private->kick_work);
1007 } else 1007 } else
1008 /* Start delayed path verification. */ 1008 /* Start delayed path verification. */