Skip to content

Commit

Permalink
gigaset: remove unnecessary poll method
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tilman Schmidt authored and David S. Miller committed Nov 30, 2008
1 parent c5419e6 commit af4218c
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions drivers/isdn/gigaset/ser-gigaset.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
#include <linux/moduleparam.h>
#include <linux/platform_device.h>
#include <linux/tty.h>
#include <linux/poll.h>
#include <linux/completion.h>

/* Version Information */
Expand Down Expand Up @@ -571,7 +570,6 @@ gigaset_tty_close(struct tty_struct *tty)
}

/* prevent other callers from entering ldisc methods */
/* FIXME: should use the tty state flags */
tty->disc_data = NULL;

if (!cs->hw.ser)
Expand Down Expand Up @@ -672,18 +670,6 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
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.
* Will not be re-entered while running but other ldisc functions
Expand Down Expand Up @@ -773,7 +759,6 @@ static struct tty_ldisc_ops gigaset_ldisc = {
.read = gigaset_tty_read,
.write = gigaset_tty_write,
.ioctl = gigaset_tty_ioctl,
.poll = gigaset_tty_poll,
.receive_buf = gigaset_tty_receive,
.write_wakeup = gigaset_tty_wakeup,
};
Expand Down

0 comments on commit af4218c

Please sign in to comment.