All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lidza Louina <lidza.louina@gmail.com>
To: driverdev-devel@linuxdriverproject.org,
	Greg KH <gregkh@linuxfoundation.org>,
	Mark Hounschell <markh@compro.net>
Cc: Lidza Louina <lidza.louina@gmail.com>
Subject: [PATCH 08/12] staging: dgap: tty.c: fixes ioctl param list
Date: Wed, 21 Aug 2013 21:48:38 -0400	[thread overview]
Message-ID: <1377136122-13338-8-git-send-email-lidza.louina@gmail.com> (raw)
In-Reply-To: <1377136122-13338-1-git-send-email-lidza.louina@gmail.com>

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@gmail.com>
---
 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@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

  parent reply	other threads:[~2013-08-22  1:49 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-22  1:48 [PATCH 01/12] staging: dgap: adds dgap driver to staging Lidza Louina
2013-08-22  1:48 ` [PATCH 02/12] staging: dgap: fixes incompatible type error Lidza Louina
2013-08-22  1:48 ` [PATCH 03/12] staging: dgap: removes references to proc code Lidza Louina
2013-08-22  1:48 ` [PATCH 04/12] staging: dgap: fep5.c: fixes errors with tty function calls Lidza Louina
2013-08-22  1:48 ` [PATCH 05/12] staging: dgap: tty.c: " Lidza Louina
2013-08-22  1:48 ` [PATCH 06/12] staging: dgap: tty.c: fixes termios error Lidza Louina
2013-08-22  1:48 ` [PATCH 07/12] staging: dgap: tty.c: removes read_cnt, real_raw and rawreadok Lidza Louina
2013-08-22  1:48 ` Lidza Louina [this message]
2013-08-23  8:47   ` [PATCH 08/12] staging: dgap: tty.c: fixes ioctl param list Dan Carpenter
2013-08-23 12:42     ` Lidza Louina
2013-08-23 20:23   ` Dan Carpenter
2013-08-26 14:52     ` Lidza Louina
2013-08-27 17:20       ` Lidza Louina
2013-08-27 17:25         ` Mark Hounschell
2013-08-27 17:50           ` Lidza Louina
2013-08-27 18:53             ` Dan Carpenter
2013-08-22  1:48 ` [PATCH 09/12] staging: dgap: tty.c: fixes incompatible type error Lidza Louina
2013-08-22  1:48 ` [PATCH 10/12] staging: dgap: mgmt.c: removes unused variable Lidza Louina
2013-08-22  1:48 ` [PATCH 11/12] staging: dgap: ifdef HAVE_UNLOCKED_IOCTL conditionals Lidza Louina
2013-08-22  1:48 ` [PATCH 12/12] staging: dgap: adds driver to kernel build Lidza Louina
2013-08-22 17:12   ` Greg KH
2013-08-22 17:14   ` Greg KH
2013-08-22 17:30     ` Lidza Louina
2013-08-22  2:11 ` [PATCH 01/12] staging: dgap: adds dgap driver to staging Greg KH
2013-08-22 12:31   ` Lidza Louina
2013-08-22 17:09 ` Greg KH

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377136122-13338-8-git-send-email-lidza.louina@gmail.com \
    --to=lidza.louina@gmail.com \
    --cc=driverdev-devel@linuxdriverproject.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=markh@compro.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.