diff options
Diffstat (limited to 'drivers/s390/char/tty3270.c')
| -rw-r--r-- | drivers/s390/char/tty3270.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index f496f236b9c0..29718042c6c9 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c | |||
| @@ -437,7 +437,7 @@ tty3270_rcl_add(struct tty3270 *tp, char *input, int len) | |||
| 437 | { | 437 | { |
| 438 | struct string *s; | 438 | struct string *s; |
| 439 | 439 | ||
| 440 | tp->rcl_walk = 0; | 440 | tp->rcl_walk = NULL; |
| 441 | if (len <= 0) | 441 | if (len <= 0) |
| 442 | return; | 442 | return; |
| 443 | if (tp->rcl_nr >= tp->rcl_max) { | 443 | if (tp->rcl_nr >= tp->rcl_max) { |
| @@ -466,12 +466,12 @@ tty3270_rcl_backward(struct kbd_data *kbd) | |||
| 466 | else if (!list_empty(&tp->rcl_lines)) | 466 | else if (!list_empty(&tp->rcl_lines)) |
| 467 | tp->rcl_walk = tp->rcl_lines.prev; | 467 | tp->rcl_walk = tp->rcl_lines.prev; |
| 468 | s = tp->rcl_walk ? | 468 | s = tp->rcl_walk ? |
| 469 | list_entry(tp->rcl_walk, struct string, list) : 0; | 469 | list_entry(tp->rcl_walk, struct string, list) : NULL; |
| 470 | if (tp->rcl_walk) { | 470 | if (tp->rcl_walk) { |
| 471 | s = list_entry(tp->rcl_walk, struct string, list); | 471 | s = list_entry(tp->rcl_walk, struct string, list); |
| 472 | tty3270_update_prompt(tp, s->string, s->len); | 472 | tty3270_update_prompt(tp, s->string, s->len); |
| 473 | } else | 473 | } else |
| 474 | tty3270_update_prompt(tp, 0, 0); | 474 | tty3270_update_prompt(tp, NULL, 0); |
| 475 | tty3270_set_timer(tp, 1); | 475 | tty3270_set_timer(tp, 1); |
| 476 | } | 476 | } |
| 477 | spin_unlock_bh(&tp->view.lock); | 477 | spin_unlock_bh(&tp->view.lock); |
| @@ -553,7 +553,7 @@ tty3270_read_tasklet(struct raw3270_request *rrq) | |||
| 553 | * has to be emitted to the tty and for 0x6d the screen | 553 | * has to be emitted to the tty and for 0x6d the screen |
| 554 | * needs to be redrawn. | 554 | * needs to be redrawn. |
| 555 | */ | 555 | */ |
| 556 | input = 0; | 556 | input = NULL; |
| 557 | len = 0; | 557 | len = 0; |
| 558 | if (tp->input->string[0] == 0x7d) { | 558 | if (tp->input->string[0] == 0x7d) { |
| 559 | /* Enter: write input to tty. */ | 559 | /* Enter: write input to tty. */ |
| @@ -567,7 +567,7 @@ tty3270_read_tasklet(struct raw3270_request *rrq) | |||
| 567 | tty3270_update_status(tp); | 567 | tty3270_update_status(tp); |
| 568 | } | 568 | } |
| 569 | /* Clear input area. */ | 569 | /* Clear input area. */ |
| 570 | tty3270_update_prompt(tp, 0, 0); | 570 | tty3270_update_prompt(tp, NULL, 0); |
| 571 | tty3270_set_timer(tp, 1); | 571 | tty3270_set_timer(tp, 1); |
| 572 | } else if (tp->input->string[0] == 0x6d) { | 572 | } else if (tp->input->string[0] == 0x6d) { |
| 573 | /* Display has been cleared. Redraw. */ | 573 | /* Display has been cleared. Redraw. */ |
| @@ -808,8 +808,8 @@ tty3270_release(struct raw3270_view *view) | |||
| 808 | tp = (struct tty3270 *) view; | 808 | tp = (struct tty3270 *) view; |
| 809 | tty = tp->tty; | 809 | tty = tp->tty; |
| 810 | if (tty) { | 810 | if (tty) { |
| 811 | tty->driver_data = 0; | 811 | tty->driver_data = NULL; |
| 812 | tp->tty = tp->kbd->tty = 0; | 812 | tp->tty = tp->kbd->tty = NULL; |
| 813 | tty_hangup(tty); | 813 | tty_hangup(tty); |
| 814 | raw3270_put_view(&tp->view); | 814 | raw3270_put_view(&tp->view); |
| 815 | } | 815 | } |
| @@ -948,8 +948,8 @@ tty3270_close(struct tty_struct *tty, struct file * filp) | |||
| 948 | return; | 948 | return; |
| 949 | tp = (struct tty3270 *) tty->driver_data; | 949 | tp = (struct tty3270 *) tty->driver_data; |
| 950 | if (tp) { | 950 | if (tp) { |
| 951 | tty->driver_data = 0; | 951 | tty->driver_data = NULL; |
| 952 | tp->tty = tp->kbd->tty = 0; | 952 | tp->tty = tp->kbd->tty = NULL; |
| 953 | raw3270_put_view(&tp->view); | 953 | raw3270_put_view(&tp->view); |
| 954 | } | 954 | } |
| 955 | } | 955 | } |
| @@ -1673,7 +1673,7 @@ tty3270_set_termios(struct tty_struct *tty, struct termios *old) | |||
| 1673 | new = L_ECHO(tty) ? TF_INPUT: TF_INPUTN; | 1673 | new = L_ECHO(tty) ? TF_INPUT: TF_INPUTN; |
| 1674 | if (new != tp->inattr) { | 1674 | if (new != tp->inattr) { |
| 1675 | tp->inattr = new; | 1675 | tp->inattr = new; |
| 1676 | tty3270_update_prompt(tp, 0, 0); | 1676 | tty3270_update_prompt(tp, NULL, 0); |
| 1677 | tty3270_set_timer(tp, 1); | 1677 | tty3270_set_timer(tp, 1); |
| 1678 | } | 1678 | } |
| 1679 | } | 1679 | } |
| @@ -1759,7 +1759,7 @@ void | |||
| 1759 | tty3270_notifier(int index, int active) | 1759 | tty3270_notifier(int index, int active) |
| 1760 | { | 1760 | { |
| 1761 | if (active) | 1761 | if (active) |
| 1762 | tty_register_device(tty3270_driver, index, 0); | 1762 | tty_register_device(tty3270_driver, index, NULL); |
| 1763 | else | 1763 | else |
| 1764 | tty_unregister_device(tty3270_driver, index); | 1764 | tty_unregister_device(tty3270_driver, index); |
| 1765 | } | 1765 | } |
| @@ -1818,7 +1818,7 @@ tty3270_exit(void) | |||
| 1818 | 1818 | ||
| 1819 | raw3270_unregister_notifier(tty3270_notifier); | 1819 | raw3270_unregister_notifier(tty3270_notifier); |
| 1820 | driver = tty3270_driver; | 1820 | driver = tty3270_driver; |
| 1821 | tty3270_driver = 0; | 1821 | tty3270_driver = NULL; |
| 1822 | tty_unregister_driver(driver); | 1822 | tty_unregister_driver(driver); |
| 1823 | tty3270_del_views(); | 1823 | tty3270_del_views(); |
| 1824 | } | 1824 | } |
