diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-03-01 00:12:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-01 16:11:01 -0500 |
commit | 751b3840d216f1ecd3b91ff5251bf7703b690cd8 (patch) | |
tree | 2d35b503c65f148d54a880e07e33d8ed3fab76d7 /drivers/char/pcmcia/synclink_cs.c | |
parent | c976cc3aa99e813084fc4bd295c9f7b706738b48 (diff) |
pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
The ioctl file pointer was removed in commit 6caa76
"tty: now phase out the ioctl file pointer for good".
Thus fix the prototype for mgslpc_ioctl() and eliminate below warning:
CC [M] drivers/char/pcmcia/synclink_cs.o
drivers/char/pcmcia/synclink_cs.c:2787: warning: initialization from incompatible pointer type
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/pcmcia/synclink_cs.c')
-rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 02127cad0980..beca80bb9bdb 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c | |||
@@ -2222,13 +2222,12 @@ static int mgslpc_get_icount(struct tty_struct *tty, | |||
2222 | * Arguments: | 2222 | * Arguments: |
2223 | * | 2223 | * |
2224 | * tty pointer to tty instance data | 2224 | * tty pointer to tty instance data |
2225 | * file pointer to associated file object for device | ||
2226 | * cmd IOCTL command code | 2225 | * cmd IOCTL command code |
2227 | * arg command argument/context | 2226 | * arg command argument/context |
2228 | * | 2227 | * |
2229 | * Return Value: 0 if success, otherwise error code | 2228 | * Return Value: 0 if success, otherwise error code |
2230 | */ | 2229 | */ |
2231 | static int mgslpc_ioctl(struct tty_struct *tty, struct file * file, | 2230 | static int mgslpc_ioctl(struct tty_struct *tty, |
2232 | unsigned int cmd, unsigned long arg) | 2231 | unsigned int cmd, unsigned long arg) |
2233 | { | 2232 | { |
2234 | MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data; | 2233 | MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data; |