commit e6b14f5bc9803589241bc2aae1565fa0c5bd0ce1
Author: Jeff Dike <[email protected]>
Date: Thu Jun 17 11:54:24 2010 -0400
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.
diff --git a/include/asm-generic/ioctls.h b/include/asm-generic/ioctls.h
index a799e20..16218ac 100644
--- a/include/asm-generic/ioctls.h
+++ b/include/asm-generic/ioctls.h
@@ -86,16 +86,6 @@
#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
-/*
- * some architectures define FIOQSIZE as 0x545E, which is used for
- * TIOCGHAYESESP on others
- */
-#ifndef FIOQSIZE
-# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
-# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
-# define FIOQSIZE 0x5460
-#endif
-
/* Used for packet mode */
#define TIOCPKT_DATA 0
#define TIOCPKT_FLUSHREAD 1
On Thu, Jun 17, 2010 at 12:00:45PM -0400, Jeff Dike wrote:
> commit e6b14f5bc9803589241bc2aae1565fa0c5bd0ce1
> Author: Jeff Dike <[email protected]>
> Date: Thu Jun 17 11:54:24 2010 -0400
>
> 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.
>
You forgot to put a "Signed-off-by:" line in here.
Care to add it, and resend it to me?
thanks,
greg k-h
On Thu, Jun 17, 2010 at 10:28:28AM -0700, Greg KH wrote:
> You forgot to put a "Signed-off-by:" line in here.
>
> Care to add it, and resend it to me?
Oops...
commit e6b14f5bc9803589241bc2aae1565fa0c5bd0ce1
Author: Jeff Dike <[email protected]>
Date: Thu Jun 17 11:54:24 2010 -0400
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 <[email protected]>
diff --git a/include/asm-generic/ioctls.h b/include/asm-generic/ioctls.h
index a799e20..16218ac 100644
--- a/include/asm-generic/ioctls.h
+++ b/include/asm-generic/ioctls.h
@@ -86,16 +86,6 @@
#define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
#define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
-/*
- * some architectures define FIOQSIZE as 0x545E, which is used for
- * TIOCGHAYESESP on others
- */
-#ifndef FIOQSIZE
-# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
-# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
-# define FIOQSIZE 0x5460
-#endif
-
/* Used for packet mode */
#define TIOCPKT_DATA 0
#define TIOCPKT_FLUSHREAD 1
On Thursday 17 June 2010 21:15:16 Jeff Dike wrote:
> 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 <[email protected]>
There are still eight architectures that define the same values
in their private headers, those should probably get removed as well.
Arnd
On Thu, Jun 17, 2010 at 09:44:31PM +0200, Arnd Bergmann wrote:
> On Thursday 17 June 2010 21:15:16 Jeff Dike wrote:
>
> > 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 <[email protected]>
>
> There are still eight architectures that define the same values
> in their private headers, those should probably get removed as well.
Thanks for pointing that out, I'll go remove them as well.
greg k-h
On Thu, Jun 17, 2010 at 03:15:16PM -0400, Jeff Dike wrote:
> On Thu, Jun 17, 2010 at 10:28:28AM -0700, Greg KH wrote:
> > You forgot to put a "Signed-off-by:" line in here.
> >
> > Care to add it, and resend it to me?
>
> Oops...
>
> commit e6b14f5bc9803589241bc2aae1565fa0c5bd0ce1
> Author: Jeff Dike <[email protected]>
> Date: Thu Jun 17 11:54:24 2010 -0400
>
> 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 <[email protected]>
>
> diff --git a/include/asm-generic/ioctls.h b/include/asm-generic/ioctls.h
> index a799e20..16218ac 100644
> --- a/include/asm-generic/ioctls.h
> +++ b/include/asm-generic/ioctls.h
> @@ -86,16 +86,6 @@
> #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
> #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
>
> -/*
> - * some architectures define FIOQSIZE as 0x545E, which is used for
> - * TIOCGHAYESESP on others
> - */
> -#ifndef FIOQSIZE
> -# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
> -# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
> -# define FIOQSIZE 0x5460
> -#endif
Wait, don't we still need to define FIOQSIZE here if no one else has
done it yet? With this patch I get a build error on fs/ioctl.c:
fs/ioctl.c: In function ‘do_vfs_ioctl’:
fs/ioctl.c:573:7: error: ‘FIOQSIZE’ undeclared (first use in this function)
So shouldn't we just remove the TIOCGHAYESESP and TIOCSHAYESESP values,
and only set FIOQSIZE if it's not set yet?
thanks,
greg k-h
On Thu, Jun 17, 2010 at 01:09:38PM -0700, Greg KH wrote:
> On Thu, Jun 17, 2010 at 03:15:16PM -0400, Jeff Dike wrote:
> > On Thu, Jun 17, 2010 at 10:28:28AM -0700, Greg KH wrote:
> > > You forgot to put a "Signed-off-by:" line in here.
> > >
> > > Care to add it, and resend it to me?
> >
> > Oops...
> >
> > commit e6b14f5bc9803589241bc2aae1565fa0c5bd0ce1
> > Author: Jeff Dike <[email protected]>
> > Date: Thu Jun 17 11:54:24 2010 -0400
> >
> > 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 <[email protected]>
> >
> > diff --git a/include/asm-generic/ioctls.h b/include/asm-generic/ioctls.h
> > index a799e20..16218ac 100644
> > --- a/include/asm-generic/ioctls.h
> > +++ b/include/asm-generic/ioctls.h
> > @@ -86,16 +86,6 @@
> > #define TIOCMIWAIT 0x545C /* wait for a change on serial input line(s) */
> > #define TIOCGICOUNT 0x545D /* read serial port inline interrupt counts */
> >
> > -/*
> > - * some architectures define FIOQSIZE as 0x545E, which is used for
> > - * TIOCGHAYESESP on others
> > - */
> > -#ifndef FIOQSIZE
> > -# define TIOCGHAYESESP 0x545E /* Get Hayes ESP configuration */
> > -# define TIOCSHAYESESP 0x545F /* Set Hayes ESP configuration */
> > -# define FIOQSIZE 0x5460
> > -#endif
>
> Wait, don't we still need to define FIOQSIZE here if no one else has
> done it yet? With this patch I get a build error on fs/ioctl.c:
> fs/ioctl.c: In function ‘do_vfs_ioctl’:
> fs/ioctl.c:573:7: error: ‘FIOQSIZE’ undeclared (first use in this function)
>
> So shouldn't we just remove the TIOCGHAYESESP and TIOCSHAYESESP values,
> and only set FIOQSIZE if it's not set yet?
How about something like the following:
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
This is a note to let you know that I've just added the patch titled
Subject: tty: Remove Hayes ESP ioctls
to my gregkh-2.6 tree. Its filename is
tty-remove-hayes-esp-ioctls.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
>From [email protected] Thu Jun 17 13:03:30 2010
From: Jeff Dike <[email protected]>
Date: Thu, 17 Jun 2010 15:15:16 -0400
Subject: tty: Remove Hayes ESP ioctls
To: Greg KH <[email protected]>
Cc: Alan Cox <[email protected]>, LKML <[email protected]>
Message-ID: <[email protected]>
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 <[email protected]>
Acked-by: Alan Cox <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
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
On Thursday 17 June 2010 22:14:17 Greg KH wrote:
> --- 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
Yes, that looks right. I had introduced the #ifdef originally, but
did not look closely enough at the patch now.
Arnd
On Thu, Jun 17, 2010 at 10:41:05PM +0200, Arnd Bergmann wrote:
> On Thursday 17 June 2010 22:14:17 Greg KH wrote:
> > --- 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
>
> Yes, that looks right. I had introduced the #ifdef originally, but
> did not look closely enough at the patch now.
>
> Arnd
>
That's better. I had figured that the whole block was due to the driver,
and therefore could be nuked.
Jeff
--
Work email - jdike at linux dot intel dot com
On Thu, Jun 17, 2010 at 05:29:36PM -0400, Jeff Dike wrote:
> On Thu, Jun 17, 2010 at 10:41:05PM +0200, Arnd Bergmann wrote:
> > On Thursday 17 June 2010 22:14:17 Greg KH wrote:
> > > --- 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
> >
> > Yes, that looks right. I had introduced the #ifdef originally, but
> > did not look closely enough at the patch now.
> >
> > Arnd
> >
>
> That's better. I had figured that the whole block was due to the driver,
> and therefore could be nuked.
Next time you might want to build your patches :)
thanks,
greg k-h
On Thu, Jun 17, 2010 at 03:03:25PM -0700, Greg KH wrote:
> Next time you might want to build your patches :)
Yup, sorry - my bad.
Jeff