The declaration for the ioctl function has changed. The previous version
of this declaration took struct file *file as a parameter and the new
one does not. This patch removes that parameter.
It also removes cases for the commands TIOCGETP
TCGETS and TCGETA.
Signed-off-by: Lidza Louina <lidza.louina@xxxxxxxxx>
---
drivers/staging/dgap/dgap_tty.c | 39 ++-------------------------------------
1 file changed, 2 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/dgap/dgap_tty.c b/drivers/staging/dgap/dgap_tty.c
index 3fc6c5a..0ca1416 100644
--- a/drivers/staging/dgap/dgap_tty.c
+++ b/drivers/staging/dgap/dgap_tty.c
@@ -112,7 +112,7 @@ static struct ktermios DgapDefaultTermios =
static int dgap_tty_open(struct tty_struct *tty, struct file *file);
static void dgap_tty_close(struct tty_struct *tty, struct file *file);
static int dgap_block_til_ready(struct tty_struct *tty, struct file *file, struct channel_t *ch);
-static int dgap_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg);
+static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg);
static int dgap_tty_digigeta(struct tty_struct *tty, struct digi_t __user *retinfo);
static int dgap_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_info);
static int dgap_tty_digigetedelay(struct tty_struct *tty, int __user *retinfo);
@@ -3164,7 +3164,7 @@ static void dgap_tty_flush_buffer(struct tty_struct *tty)
*
* The usual assortment of ioctl's
*/
-static int dgap_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd,
+static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
unsigned long arg)
{
struct board_t *bd;
@@ -3423,41 +3423,6 @@ static int dgap_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned in
return(-ENOIOCTLCMD);
-#ifdef TIOCGETP
- case TIOCGETP:
-#endif
- case TCGETS:
- case TCGETA:
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
- if (tty->ldisc->ops->ioctl) {
-#else
- if (tty->ldisc.ops->ioctl) {
-#endif
- int retval = (-ENXIO);
-
- DGAP_UNLOCK(ch->ch_lock, lock_flags2);
- DGAP_UNLOCK(bd->bd_lock, lock_flags);
-
- if (tty->termios) {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,31)
- retval = ((tty->ldisc->ops->ioctl) (tty, file, cmd, arg));
-#else
- retval = ((tty->ldisc.ops->ioctl) (tty, file, cmd, arg));
-#endif
- }
-
- DPR_IOCTL(("dgap_tty_ioctl (LINE:%d) finish on port %d - cmd %s (%x), arg %lx\n",
- __LINE__, ch->ch_portnum, dgap_ioctl_name(cmd), cmd, arg));
- return(retval);
- }
-
- DGAP_UNLOCK(ch->ch_lock, lock_flags2);
- DGAP_UNLOCK(bd->bd_lock, lock_flags);
- DPR_IOCTL(("dgap_tty_ioctl (LINE:%d) finish on port %d - cmd %s (%x), arg %lx\n",
- __LINE__, ch->ch_portnum, dgap_ioctl_name(cmd), cmd, arg));
-
- return(-ENOIOCTLCMD);
-
case TCSETSF:
case TCSETSW:
/*
--
1.8.1.2
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
