Skip to content

Commit

Permalink
pcmcia: synclink_cs: fix prototype for mgslpc_ioctl()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Axel Lin authored and Greg Kroah-Hartman committed Mar 1, 2011
1 parent c976cc3 commit 751b384
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/char/pcmcia/synclink_cs.c
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 751b384

Please sign in to comment.