From: Lidza Louina Date: Tue, 13 Aug 2013 19:49:57 +0000 (-0400) Subject: staging: dgnc: fixes ioctl param list X-Git-Tag: firefly_0821_release~176^2~5471^2~276 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a31cefa2648205a972b65c4b8d520823ae4be1b6;p=firefly-linux-kernel-4.4.55.git staging: dgnc: fixes ioctl param list The declaration for the ioctl function has changed. The previous version of this declaration took struct file *file as a parameter and the new one does not. This patch removes that parameter. Signed-off-by: Lidza Louina Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index 9dbe7bd0d2ff..6f2ddb33176c 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -112,7 +112,7 @@ static struct ktermios DgncDefaultTermios = static int dgnc_tty_open(struct tty_struct *tty, struct file *file); static void dgnc_tty_close(struct tty_struct *tty, struct file *file); static int dgnc_block_til_ready(struct tty_struct *tty, struct file *file, struct channel_t *ch); -static int dgnc_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg); +static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg); static int dgnc_tty_digigeta(struct tty_struct *tty, struct digi_t __user *retinfo); static int dgnc_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_info); static int dgnc_tty_write_room(struct tty_struct* tty); @@ -3123,7 +3123,7 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty) * * The usual assortment of ioctl's */ -static int dgnc_tty_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, +static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { struct board_t *bd;