Commit 5cdfbdce authored by Oscar Carter's avatar Oscar Carter Committed by Heiko Carstens

s390/tty3270: remove function callback casts

In an effort to enable -Wcast-function-type in the top-level Makefile to
support Control Flow Integrity builds, remove all the function callback
casts.

To do this modify the function prototypes accordingly.
Signed-off-by: default avatarOscar Carter <oscar.carter@gmx.com>
Message-Id: <20200627125417.18887-1-oscar.carter@gmx.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
[heiko.carstens@de.ibm.com: coding style changes]
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent f05f62d0
...@@ -556,8 +556,9 @@ tty3270_scroll_backward(struct kbd_data *kbd) ...@@ -556,8 +556,9 @@ tty3270_scroll_backward(struct kbd_data *kbd)
* Pass input line to tty. * Pass input line to tty.
*/ */
static void static void
tty3270_read_tasklet(struct raw3270_request *rrq) tty3270_read_tasklet(unsigned long data)
{ {
struct raw3270_request *rrq = (struct raw3270_request *)data;
static char kreset_data = TW_KR; static char kreset_data = TW_KR;
struct tty3270 *tp = container_of(rrq->view, struct tty3270, view); struct tty3270 *tp = container_of(rrq->view, struct tty3270, view);
char *input; char *input;
...@@ -652,8 +653,9 @@ tty3270_issue_read(struct tty3270 *tp, int lock) ...@@ -652,8 +653,9 @@ tty3270_issue_read(struct tty3270 *tp, int lock)
* Hang up the tty * Hang up the tty
*/ */
static void static void
tty3270_hangup_tasklet(struct tty3270 *tp) tty3270_hangup_tasklet(unsigned long data)
{ {
struct tty3270 *tp = (struct tty3270 *)data;
tty_port_tty_hangup(&tp->port, true); tty_port_tty_hangup(&tp->port, true);
raw3270_put_view(&tp->view); raw3270_put_view(&tp->view);
} }
...@@ -752,11 +754,9 @@ tty3270_alloc_view(void) ...@@ -752,11 +754,9 @@ tty3270_alloc_view(void)
tty_port_init(&tp->port); tty_port_init(&tp->port);
timer_setup(&tp->timer, tty3270_update, 0); timer_setup(&tp->timer, tty3270_update, 0);
tasklet_init(&tp->readlet, tasklet_init(&tp->readlet, tty3270_read_tasklet,
(void (*)(unsigned long)) tty3270_read_tasklet,
(unsigned long) tp->read); (unsigned long) tp->read);
tasklet_init(&tp->hanglet, tasklet_init(&tp->hanglet, tty3270_hangup_tasklet,
(void (*)(unsigned long)) tty3270_hangup_tasklet,
(unsigned long) tp); (unsigned long) tp);
INIT_WORK(&tp->resize_work, tty3270_resize_work); INIT_WORK(&tp->resize_work, tty3270_resize_work);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment