pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
authorAxel Lin <axel.lin@gmail.com>
Tue, 1 Mar 2011 05:12:47 +0000 (13:12 +0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 1 Mar 2011 21:11:01 +0000 (16:11 -0500)
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>
drivers/char/pcmcia/synclink_cs.c

index 02127cad0980e6eaa986910ce0f329daf535a3e2..beca80bb9bdbfa1f14ff1b0459a5cef9af23e245 100644 (file)
@@ -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;