diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-17 13:18:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-17 13:18:47 -0700 |
| commit | e08a8b84f590f4cc576d4dc0c2fed6b555caea0a (patch) | |
| tree | 646342799e52312706f99e0c77e9174784c706c8 | |
| parent | 716f37f0b1935f62d717d0ca930453e10ddb4f08 (diff) | |
| download | patches-e08a8b84f590f4cc576d4dc0c2fed6b555caea0a.tar.gz | |
tty patches
| -rw-r--r-- | series | 3 | ||||
| -rw-r--r-- | tty/tty-remove-hayes-esp-ioctls.patch | 41 | ||||
| -rw-r--r-- | tty/tty-remove-remaining-hayes-esp-ioctls.patch | 115 |
3 files changed, 159 insertions, 0 deletions
@@ -63,6 +63,8 @@ tty/mrst_max3110-add-uart-driver-for-max3110-on-moorestown.patch tty/max3110-sanity-check-a-register.patch tty/serial-replace-open-coded-mutex-with-a-real-mutex-in-mrst_max3110.c.patch tty/serial-fix-wakup-races-in-the-mrst_max3110-driver.patch +tty/tty-remove-hayes-esp-ioctls.patch +tty/tty-remove-remaining-hayes-esp-ioctls.patch # tty bkl removal work tty/stallion-prune-lock_kernel-calls.patch @@ -145,3 +147,4 @@ usb/usb-gadget-f_fs-use-usb_string_ids_n.patch # staging stuff is now in the staging-next tree on git.kernel.org + diff --git a/tty/tty-remove-hayes-esp-ioctls.patch b/tty/tty-remove-hayes-esp-ioctls.patch new file mode 100644 index 00000000000000..d675b558db8b5d --- /dev/null +++ b/tty/tty-remove-hayes-esp-ioctls.patch @@ -0,0 +1,41 @@ +From jdike@addtoit.com Thu Jun 17 13:03:30 2010 +From: Jeff Dike <jdike@addtoit.com> +Date: Thu, 17 Jun 2010 15:15:16 -0400 +Subject: tty: Remove Hayes ESP ioctls +To: Greg KH <greg@kroah.com> +Cc: Alan Cox <alan@linux.intel.com>, LKML <linux-kernel@vger.kernel.org> +Message-ID: <20100617191516.GA15963@c-98-229-117-200.hsd1.ma.comcast.net> +Content-Disposition: inline + +Remove Hayes ESP ioctls + +The Hayes ESP driver has been removed from the tree: +commit f53a2ade0bb9f2a81f473e6469155172a96b7c38 +("tty: esp: remove broken driver") +so its ioctls aren't needed any more. + +Signed-off-by: Jeff Dike <jdike@linux.intel.com> +Acked-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + include/asm-generic/ioctls.h | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +--- a/include/asm-generic/ioctls.h ++++ b/include/asm-generic/ioctls.h +@@ -87,12 +87,10 @@ + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ + + /* +- * some architectures define FIOQSIZE as 0x545E, which is used for +- * TIOCGHAYESESP on others ++ * Some arches already define FIOQSIZE due to a historical ++ * conflict with a Hayes modem-specific ioctl value. + */ + #ifndef FIOQSIZE +-# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ +-# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ + # define FIOQSIZE 0x5460 + #endif + diff --git a/tty/tty-remove-remaining-hayes-esp-ioctls.patch b/tty/tty-remove-remaining-hayes-esp-ioctls.patch new file mode 100644 index 00000000000000..f651916b0ca8a4 --- /dev/null +++ b/tty/tty-remove-remaining-hayes-esp-ioctls.patch @@ -0,0 +1,115 @@ +From foo@baz Thu Jun 17 13:16:08 PDT 2010 +Date: Thu, 17 Jun 2010 13:16:08 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: tty: remove remaining Hayes ESP ioctls + +As Jeff Dike pointed out, the Hayes ESP driver was removed in commit +f53a2ade0bb9f2a81f473e6469155172a96b7c38, so these ioctl definitions +should also be removed. This cleans up the remaining arch-specific +locations of this ioctl value. + +Thanks to Arnd for pointing these out. + +Cc: Jeff Dike <jdike@addtoit.com> +Cc: Arnd Bergmann <arnd@arndb.de> +Cc: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + arch/alpha/include/asm/ioctls.h | 2 -- + arch/avr32/include/asm/ioctls.h | 2 -- + arch/cris/include/asm/ioctls.h | 2 -- + arch/ia64/include/asm/ioctls.h | 2 -- + arch/m32r/include/asm/ioctls.h | 2 -- + arch/mips/include/asm/ioctls.h | 2 -- + arch/mn10300/include/asm/ioctls.h | 2 -- + arch/parisc/include/asm/ioctls.h | 2 -- + 8 files changed, 16 deletions(-) + +--- a/arch/alpha/include/asm/ioctls.h ++++ b/arch/alpha/include/asm/ioctls.h +@@ -106,7 +106,5 @@ + + #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ +-#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ +-#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ + + #endif /* _ASM_ALPHA_IOCTLS_H */ +--- a/arch/avr32/include/asm/ioctls.h ++++ b/arch/avr32/include/asm/ioctls.h +@@ -69,8 +69,6 @@ + + #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ +-#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ +-#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ + #define FIOQSIZE 0x5460 + + /* Used for packet mode */ +--- a/arch/cris/include/asm/ioctls.h ++++ b/arch/cris/include/asm/ioctls.h +@@ -70,8 +70,6 @@ + + #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ +-#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ +-#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ + #define FIOQSIZE 0x5460 + + #define TIOCSERSETRS485 0x5461 /* enable rs-485 (deprecated) */ +--- a/arch/ia64/include/asm/ioctls.h ++++ b/arch/ia64/include/asm/ioctls.h +@@ -75,8 +75,6 @@ + + #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ +-#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ +-#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ + #define FIOQSIZE 0x5460 + + /* Used for packet mode */ +--- a/arch/m32r/include/asm/ioctls.h ++++ b/arch/m32r/include/asm/ioctls.h +@@ -69,8 +69,6 @@ + + #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ +-#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ +-#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ + #define FIOQSIZE 0x5460 + + /* Used for packet mode */ +--- a/arch/mips/include/asm/ioctls.h ++++ b/arch/mips/include/asm/ioctls.h +@@ -103,7 +103,5 @@ + #define TIOCSERSETMULTI 0x5490 /* Set multiport config */ + #define TIOCMIWAIT 0x5491 /* wait for a change on serial input line(s) */ + #define TIOCGICOUNT 0x5492 /* read serial port inline interrupt counts */ +-#define TIOCGHAYESESP 0x5493 /* Get Hayes ESP configuration */ +-#define TIOCSHAYESESP 0x5494 /* Set Hayes ESP configuration */ + + #endif /* __ASM_IOCTLS_H */ +--- a/arch/mn10300/include/asm/ioctls.h ++++ b/arch/mn10300/include/asm/ioctls.h +@@ -70,8 +70,6 @@ + + #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ +-#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ +-#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ + #define FIOQSIZE 0x5460 + + /* Used for packet mode */ +--- a/arch/parisc/include/asm/ioctls.h ++++ b/arch/parisc/include/asm/ioctls.h +@@ -68,8 +68,6 @@ + + #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */ + #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */ +-#define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */ +-#define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */ + #define FIOQSIZE 0x5460 /* Get exact space used by quota */ + + #define TIOCSTART 0x5461 |