mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-12 16:58:53 +00:00
gigaset: remove unnecessary poll method
The N_GIGASET_M101 line discipline implemented by the ser_gigaset driver does not transfer any data from/to userspace through the tty interface. Therefore a poll method is not needed. Signed-off-by: Tilman Schmidt <tilman@imap.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c5419e6f05
commit
af4218c3a6
@ -16,7 +16,6 @@
|
|||||||
#include <linux/moduleparam.h>
|
#include <linux/moduleparam.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/tty.h>
|
#include <linux/tty.h>
|
||||||
#include <linux/poll.h>
|
|
||||||
#include <linux/completion.h>
|
#include <linux/completion.h>
|
||||||
|
|
||||||
/* Version Information */
|
/* Version Information */
|
||||||
@ -571,7 +570,6 @@ gigaset_tty_close(struct tty_struct *tty)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* prevent other callers from entering ldisc methods */
|
/* prevent other callers from entering ldisc methods */
|
||||||
/* FIXME: should use the tty state flags */
|
|
||||||
tty->disc_data = NULL;
|
tty->disc_data = NULL;
|
||||||
|
|
||||||
if (!cs->hw.ser)
|
if (!cs->hw.ser)
|
||||||
@ -672,18 +670,6 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Poll on the tty.
|
|
||||||
* Unused, always return zero.
|
|
||||||
*
|
|
||||||
* FIXME: should probably return an exception - especially on hangup
|
|
||||||
*/
|
|
||||||
static unsigned int
|
|
||||||
gigaset_tty_poll(struct tty_struct *tty, struct file *file, poll_table *wait)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Called by the tty driver when a block of data has been received.
|
* Called by the tty driver when a block of data has been received.
|
||||||
* Will not be re-entered while running but other ldisc functions
|
* Will not be re-entered while running but other ldisc functions
|
||||||
@ -773,7 +759,6 @@ static struct tty_ldisc_ops gigaset_ldisc = {
|
|||||||
.read = gigaset_tty_read,
|
.read = gigaset_tty_read,
|
||||||
.write = gigaset_tty_write,
|
.write = gigaset_tty_write,
|
||||||
.ioctl = gigaset_tty_ioctl,
|
.ioctl = gigaset_tty_ioctl,
|
||||||
.poll = gigaset_tty_poll,
|
|
||||||
.receive_buf = gigaset_tty_receive,
|
.receive_buf = gigaset_tty_receive,
|
||||||
.write_wakeup = gigaset_tty_wakeup,
|
.write_wakeup = gigaset_tty_wakeup,
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user