diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 11:26:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:52:43 -0500 |
commit | 20b9d17715017ae4dd4ec87fabc36d33b9de708e (patch) | |
tree | 64e9c4ff845844298f9056357d9f4914802207f8 /drivers/char/epca.c | |
parent | 60b33c133ca0b7c0b6072c87234b63fee6e80558 (diff) |
tiocmset: kill the file pointer argument
Doing tiocmget was such fun we should do tiocmset as well for the same
reasons
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char/epca.c')
-rw-r--r-- | drivers/char/epca.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index ecf6f0a889fc..e5872b59f9cd 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c | |||
@@ -2015,7 +2015,7 @@ static int pc_tiocmget(struct tty_struct *tty) | |||
2015 | return mflag; | 2015 | return mflag; |
2016 | } | 2016 | } |
2017 | 2017 | ||
2018 | static int pc_tiocmset(struct tty_struct *tty, struct file *file, | 2018 | static int pc_tiocmset(struct tty_struct *tty, |
2019 | unsigned int set, unsigned int clear) | 2019 | unsigned int set, unsigned int clear) |
2020 | { | 2020 | { |
2021 | struct channel *ch = tty->driver_data; | 2021 | struct channel *ch = tty->driver_data; |
@@ -2081,7 +2081,7 @@ static int pc_ioctl(struct tty_struct *tty, struct file *file, | |||
2081 | case TIOCMODS: | 2081 | case TIOCMODS: |
2082 | if (get_user(mstat, (unsigned __user *)argp)) | 2082 | if (get_user(mstat, (unsigned __user *)argp)) |
2083 | return -EFAULT; | 2083 | return -EFAULT; |
2084 | return pc_tiocmset(tty, file, mstat, ~mstat); | 2084 | return pc_tiocmset(tty, mstat, ~mstat); |
2085 | case TIOCSDTR: | 2085 | case TIOCSDTR: |
2086 | spin_lock_irqsave(&epca_lock, flags); | 2086 | spin_lock_irqsave(&epca_lock, flags); |
2087 | ch->omodem |= ch->m_dtr; | 2087 | ch->omodem |= ch->m_dtr; |