aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2008-11-30 00:38:04 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-30 00:38:04 -0500
commitaf4218c3a699542adc9b76c8972828a726e7b0dc (patch)
tree393cbcc6df5b6bf8ffd3614ff18ac5fff80db483 /drivers/isdn
parentc5419e6f054c877339f754e02c3b1dafd88cd96c (diff)
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>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/gigaset/ser-gigaset.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index 07052ed2a0c5..0b8c8f2b433f 100644
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -16,7 +16,6 @@
16#include <linux/moduleparam.h> 16#include <linux/moduleparam.h>
17#include <linux/platform_device.h> 17#include <linux/platform_device.h>
18#include <linux/tty.h> 18#include <linux/tty.h>
19#include <linux/poll.h>
20#include <linux/completion.h> 19#include <linux/completion.h>
21 20
22/* Version Information */ 21/* Version Information */
@@ -571,7 +570,6 @@ gigaset_tty_close(struct tty_struct *tty)
571 } 570 }
572 571
573 /* prevent other callers from entering ldisc methods */ 572 /* prevent other callers from entering ldisc methods */
574 /* FIXME: should use the tty state flags */
575 tty->disc_data = NULL; 573 tty->disc_data = NULL;
576 574
577 if (!cs->hw.ser) 575 if (!cs->hw.ser)
@@ -673,18 +671,6 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
673} 671}
674 672
675/* 673/*
676 * Poll on the tty.
677 * Unused, always return zero.
678 *
679 * FIXME: should probably return an exception - especially on hangup
680 */
681static unsigned int
682gigaset_tty_poll(struct tty_struct *tty, struct file *file, poll_table *wait)
683{
684 return 0;
685}
686
687/*
688 * Called by the tty driver when a block of data has been received. 674 * Called by the tty driver when a block of data has been received.
689 * Will not be re-entered while running but other ldisc functions 675 * Will not be re-entered while running but other ldisc functions
690 * may be called in parallel. 676 * may be called in parallel.
@@ -773,7 +759,6 @@ static struct tty_ldisc_ops gigaset_ldisc = {
773 .read = gigaset_tty_read, 759 .read = gigaset_tty_read,
774 .write = gigaset_tty_write, 760 .write = gigaset_tty_write,
775 .ioctl = gigaset_tty_ioctl, 761 .ioctl = gigaset_tty_ioctl,
776 .poll = gigaset_tty_poll,
777 .receive_buf = gigaset_tty_receive, 762 .receive_buf = gigaset_tty_receive,
778 .write_wakeup = gigaset_tty_wakeup, 763 .write_wakeup = gigaset_tty_wakeup,
779}; 764};