diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-03-01 13:12:47 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-01 16:11:01 -0500 |
| commit | 751b3840d216f1ecd3b91ff5251bf7703b690cd8 (patch) | |
| tree | 2d35b503c65f148d54a880e07e33d8ed3fab76d7 | |
| parent | c976cc3aa99e813084fc4bd295c9f7b706738b48 (diff) | |
| download | kernel_samsung_smdk4412-751b3840d216f1ecd3b91ff5251bf7703b690cd8.zip kernel_samsung_smdk4412-751b3840d216f1ecd3b91ff5251bf7703b690cd8.tar.gz kernel_samsung_smdk4412-751b3840d216f1ecd3b91ff5251bf7703b690cd8.tar.bz2 | |
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>
| -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 02127ca..beca80b 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, * Arguments: * * tty pointer to tty instance data - * file pointer to associated file object for device * cmd IOCTL command code * arg command argument/context * * Return Value: 0 if success, otherwise error code */ -static int mgslpc_ioctl(struct tty_struct *tty, struct file * file, +static int mgslpc_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { MGSLPC_INFO * info = (MGSLPC_INFO *)tty->driver_data; |