diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 11:27:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:59:56 -0500 |
commit | 6caa76b7786891b42b66a0e61e2c2fff2c884620 (patch) | |
tree | eb6e387e080a44680d6d8686999336e69ec97e71 /drivers/isdn/gigaset | |
parent | 00a0d0d65b61241a718d0aee96f46b9a2d93bf26 (diff) |
tty: now phase out the ioctl file pointer for good
Only oddities here are a couple of drivers that bogusly called the ldisc
helpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes
away.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/isdn/gigaset')
-rw-r--r-- | drivers/isdn/gigaset/interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index 9b2bb491c614..59de638225fe 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c | |||
@@ -115,7 +115,7 @@ static int if_config(struct cardstate *cs, int *arg) | |||
115 | 115 | ||
116 | static int if_open(struct tty_struct *tty, struct file *filp); | 116 | static int if_open(struct tty_struct *tty, struct file *filp); |
117 | static void if_close(struct tty_struct *tty, struct file *filp); | 117 | static void if_close(struct tty_struct *tty, struct file *filp); |
118 | static int if_ioctl(struct tty_struct *tty, struct file *file, | 118 | static int if_ioctl(struct tty_struct *tty, |
119 | unsigned int cmd, unsigned long arg); | 119 | unsigned int cmd, unsigned long arg); |
120 | static int if_write_room(struct tty_struct *tty); | 120 | static int if_write_room(struct tty_struct *tty); |
121 | static int if_chars_in_buffer(struct tty_struct *tty); | 121 | static int if_chars_in_buffer(struct tty_struct *tty); |
@@ -205,7 +205,7 @@ static void if_close(struct tty_struct *tty, struct file *filp) | |||
205 | module_put(cs->driver->owner); | 205 | module_put(cs->driver->owner); |
206 | } | 206 | } |
207 | 207 | ||
208 | static int if_ioctl(struct tty_struct *tty, struct file *file, | 208 | static int if_ioctl(struct tty_struct *tty, |
209 | unsigned int cmd, unsigned long arg) | 209 | unsigned int cmd, unsigned long arg) |
210 | { | 210 | { |
211 | struct cardstate *cs; | 211 | struct cardstate *cs; |