From e796f78ca404fa6dc057400a1711ada72af01451 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 13 Sep 2021 17:23:13 +0200 Subject: [PATCH] Revert "ANDROID: GKI: restore termiox fields" This reverts commit db77ed2052199fcea016c5ce9f0fd62a1bcefe97. It is no longer needed in the android13-5.10 branch, and thanks to other changes in this area upstream, it actually causes build issues. Cc: Aaron Ding Signed-off-by: Greg Kroah-Hartman Change-Id: I0f6b8ccd7c881be83fb499f4c66b3cb62afb64da --- include/linux/tty.h | 4 ---- include/linux/tty_driver.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/include/linux/tty.h b/include/linux/tty.h index bd76f2f1cde0..55324c8dfce4 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -308,10 +308,6 @@ struct tty_struct { spinlock_t flow_lock; /* Termios values are protected by the termios rwsem */ struct ktermios termios, termios_locked; - - /* termiox is estored only for ABI preservation, do not use */ - struct termiox *termiox; - char name[64]; struct pid *pgrp; /* Protected by ctrl lock */ /* diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h index 61f29370e1c3..0c1b074b2bc3 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h @@ -278,10 +278,6 @@ struct tty_operations { int (*tiocmset)(struct tty_struct *tty, unsigned int set, unsigned int clear); int (*resize)(struct tty_struct *tty, struct winsize *ws); - - /* only for abi preservation */ - int (*set_termiox)(struct tty_struct *tty, struct termiox *tnew); - int (*get_icount)(struct tty_struct *tty, struct serial_icounter_struct *icount); int (*get_serial)(struct tty_struct *tty, struct serial_struct *p);