diff options
author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2006-10-11 09:31:47 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-10-11 09:31:47 -0400 |
commit | 12975aef62836e9f3e179afaaded8045f8a25ac4 (patch) | |
tree | 719a2622de3bd09d11372b535a7fba98aeedb50e /drivers/s390 | |
parent | e7769b48a0216d7262fe2ba59b1b3697be462cbb (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')
-rw-r--r-- | drivers/s390/cio/chsc.c | 6 | ||||
-rw-r--r-- | drivers/s390/cio/css.c | 2 | ||||
-rw-r--r-- | drivers/s390/cio/device.c | 16 | ||||
-rw-r--r-- | drivers/s390/cio/device_fsm.c | 28 |
4 files changed, 26 insertions, 26 deletions
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c index eabe018d348f..2d78f0f4a40f 100644 --- a/drivers/s390/cio/chsc.c +++ b/drivers/s390/cio/chsc.c | |||
@@ -370,7 +370,7 @@ __s390_process_res_acc(struct subchannel_id schid, void *data) | |||
370 | struct res_acc_data *res_data; | 370 | struct res_acc_data *res_data; |
371 | struct subchannel *sch; | 371 | struct subchannel *sch; |
372 | 372 | ||
373 | res_data = (struct res_acc_data *)data; | 373 | res_data = data; |
374 | sch = get_subchannel_by_schid(schid); | 374 | sch = get_subchannel_by_schid(schid); |
375 | if (!sch) | 375 | if (!sch) |
376 | /* Check if a subchannel is newly available. */ | 376 | /* Check if a subchannel is newly available. */ |
@@ -444,7 +444,7 @@ __get_chpid_from_lir(void *data) | |||
444 | u32 isinfo[28]; | 444 | u32 isinfo[28]; |
445 | } *lir; | 445 | } *lir; |
446 | 446 | ||
447 | lir = (struct lir*) data; | 447 | lir = data; |
448 | if (!(lir->iq&0x80)) | 448 | if (!(lir->iq&0x80)) |
449 | /* NULL link incident record */ | 449 | /* NULL link incident record */ |
450 | return -EINVAL; | 450 | return -EINVAL; |
@@ -628,7 +628,7 @@ __chp_add(struct subchannel_id schid, void *data) | |||
628 | struct channel_path *chp; | 628 | struct channel_path *chp; |
629 | struct subchannel *sch; | 629 | struct subchannel *sch; |
630 | 630 | ||
631 | chp = (struct channel_path *)data; | 631 | chp = data; |
632 | sch = get_subchannel_by_schid(schid); | 632 | sch = get_subchannel_by_schid(schid); |
633 | if (!sch) | 633 | if (!sch) |
634 | /* Check if the subchannel is now available. */ | 634 | /* Check if the subchannel is now available. */ |
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 7086a74e9871..a2dee5bf5a17 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
@@ -177,7 +177,7 @@ get_subchannel_by_schid(struct subchannel_id schid) | |||
177 | struct device *dev; | 177 | struct device *dev; |
178 | 178 | ||
179 | dev = bus_find_device(&css_bus_type, NULL, | 179 | dev = bus_find_device(&css_bus_type, NULL, |
180 | (void *)&schid, check_subchannel); | 180 | &schid, check_subchannel); |
181 | 181 | ||
182 | return dev ? to_subchannel(dev) : NULL; | 182 | return dev ? to_subchannel(dev) : NULL; |
183 | } | 183 | } |
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index 7646a9930ecb..94bdd4d8a4c9 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
@@ -591,7 +591,7 @@ ccw_device_add_changed(void *data) | |||
591 | 591 | ||
592 | struct ccw_device *cdev; | 592 | struct ccw_device *cdev; |
593 | 593 | ||
594 | cdev = (struct ccw_device *)data; | 594 | cdev = data; |
595 | if (device_add(&cdev->dev)) { | 595 | if (device_add(&cdev->dev)) { |
596 | put_device(&cdev->dev); | 596 | put_device(&cdev->dev); |
597 | return; | 597 | return; |
@@ -612,7 +612,7 @@ ccw_device_do_unreg_rereg(void *data) | |||
612 | struct subchannel *sch; | 612 | struct subchannel *sch; |
613 | int need_rename; | 613 | int need_rename; |
614 | 614 | ||
615 | cdev = (struct ccw_device *)data; | 615 | cdev = data; |
616 | sch = to_subchannel(cdev->dev.parent); | 616 | sch = to_subchannel(cdev->dev.parent); |
617 | if (cdev->private->dev_id.devno != sch->schib.pmcw.dev) { | 617 | if (cdev->private->dev_id.devno != sch->schib.pmcw.dev) { |
618 | /* | 618 | /* |
@@ -660,7 +660,7 @@ ccw_device_do_unreg_rereg(void *data) | |||
660 | snprintf (cdev->dev.bus_id, BUS_ID_SIZE, "0.%x.%04x", | 660 | snprintf (cdev->dev.bus_id, BUS_ID_SIZE, "0.%x.%04x", |
661 | sch->schid.ssid, sch->schib.pmcw.dev); | 661 | sch->schid.ssid, sch->schib.pmcw.dev); |
662 | PREPARE_WORK(&cdev->private->kick_work, | 662 | PREPARE_WORK(&cdev->private->kick_work, |
663 | ccw_device_add_changed, (void *)cdev); | 663 | ccw_device_add_changed, cdev); |
664 | queue_work(ccw_device_work, &cdev->private->kick_work); | 664 | queue_work(ccw_device_work, &cdev->private->kick_work); |
665 | } | 665 | } |
666 | 666 | ||
@@ -685,7 +685,7 @@ io_subchannel_register(void *data) | |||
685 | int ret; | 685 | int ret; |
686 | unsigned long flags; | 686 | unsigned long flags; |
687 | 687 | ||
688 | cdev = (struct ccw_device *) data; | 688 | cdev = data; |
689 | sch = to_subchannel(cdev->dev.parent); | 689 | sch = to_subchannel(cdev->dev.parent); |
690 | 690 | ||
691 | if (klist_node_attached(&cdev->dev.knode_parent)) { | 691 | if (klist_node_attached(&cdev->dev.knode_parent)) { |
@@ -757,7 +757,7 @@ io_subchannel_recog_done(struct ccw_device *cdev) | |||
757 | break; | 757 | break; |
758 | sch = to_subchannel(cdev->dev.parent); | 758 | sch = to_subchannel(cdev->dev.parent); |
759 | PREPARE_WORK(&cdev->private->kick_work, | 759 | PREPARE_WORK(&cdev->private->kick_work, |
760 | ccw_device_call_sch_unregister, (void *) cdev); | 760 | ccw_device_call_sch_unregister, cdev); |
761 | queue_work(slow_path_wq, &cdev->private->kick_work); | 761 | queue_work(slow_path_wq, &cdev->private->kick_work); |
762 | if (atomic_dec_and_test(&ccw_device_init_count)) | 762 | if (atomic_dec_and_test(&ccw_device_init_count)) |
763 | wake_up(&ccw_device_init_wq); | 763 | wake_up(&ccw_device_init_wq); |
@@ -772,7 +772,7 @@ io_subchannel_recog_done(struct ccw_device *cdev) | |||
772 | if (!get_device(&cdev->dev)) | 772 | if (!get_device(&cdev->dev)) |
773 | break; | 773 | break; |
774 | PREPARE_WORK(&cdev->private->kick_work, | 774 | PREPARE_WORK(&cdev->private->kick_work, |
775 | io_subchannel_register, (void *) cdev); | 775 | io_subchannel_register, cdev); |
776 | queue_work(slow_path_wq, &cdev->private->kick_work); | 776 | queue_work(slow_path_wq, &cdev->private->kick_work); |
777 | break; | 777 | break; |
778 | } | 778 | } |
@@ -910,7 +910,7 @@ io_subchannel_remove (struct subchannel *sch) | |||
910 | */ | 910 | */ |
911 | if (get_device(&cdev->dev)) { | 911 | if (get_device(&cdev->dev)) { |
912 | PREPARE_WORK(&cdev->private->kick_work, | 912 | PREPARE_WORK(&cdev->private->kick_work, |
913 | ccw_device_unregister, (void *) cdev); | 913 | ccw_device_unregister, cdev); |
914 | queue_work(ccw_device_work, &cdev->private->kick_work); | 914 | queue_work(ccw_device_work, &cdev->private->kick_work); |
915 | } | 915 | } |
916 | return 0; | 916 | return 0; |
@@ -1053,7 +1053,7 @@ __ccwdev_check_busid(struct device *dev, void *id) | |||
1053 | { | 1053 | { |
1054 | char *bus_id; | 1054 | char *bus_id; |
1055 | 1055 | ||
1056 | bus_id = (char *)id; | 1056 | bus_id = id; |
1057 | 1057 | ||
1058 | return (strncmp(bus_id, dev->bus_id, BUS_ID_SIZE) == 0); | 1058 | return (strncmp(bus_id, dev->bus_id, BUS_ID_SIZE) == 0); |
1059 | } | 1059 | } |
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. */ |