aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wan
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2008-12-06 01:32:22 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-06 01:32:22 -0500
commitd2b88814c6a63e4018cd299826907a12068ffdb7 (patch)
tree4ef3a7e40dc725e3e0367db1d6cb91fefbeb99d6 /drivers/net/wan
parent8a1ec21e6c856b996cffcd4b33f037f6748a3ab4 (diff)
tty: driverdata and discdata are void *
Remove all the extra casting while we are cleaning up Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r--drivers/net/wan/x25_asy.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 7c5ac40f8725..472bd0e6dd9d 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -257,7 +257,7 @@ static void x25_asy_encaps(struct x25_asy *sl, unsigned char *icp, int len)
257static void x25_asy_write_wakeup(struct tty_struct *tty) 257static void x25_asy_write_wakeup(struct tty_struct *tty)
258{ 258{
259 int actual; 259 int actual;
260 struct x25_asy *sl = (struct x25_asy *) tty->disc_data; 260 struct x25_asy *sl = tty->disc_data;
261 261
262 /* First make sure we're connected. */ 262 /* First make sure we're connected. */
263 if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev)) 263 if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev))
@@ -523,7 +523,7 @@ static int x25_asy_close(struct net_device *dev)
523static void x25_asy_receive_buf(struct tty_struct *tty, 523static void x25_asy_receive_buf(struct tty_struct *tty,
524 const unsigned char *cp, char *fp, int count) 524 const unsigned char *cp, char *fp, int count)
525{ 525{
526 struct x25_asy *sl = (struct x25_asy *) tty->disc_data; 526 struct x25_asy *sl = tty->disc_data;
527 527
528 if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev)) 528 if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev))
529 return; 529 return;
@@ -551,7 +551,7 @@ static void x25_asy_receive_buf(struct tty_struct *tty,
551 551
552static int x25_asy_open_tty(struct tty_struct *tty) 552static int x25_asy_open_tty(struct tty_struct *tty)
553{ 553{
554 struct x25_asy *sl = (struct x25_asy *) tty->disc_data; 554 struct x25_asy *sl = tty->disc_data;
555 int err; 555 int err;
556 556
557 if (tty->ops->write == NULL) 557 if (tty->ops->write == NULL)
@@ -592,7 +592,7 @@ static int x25_asy_open_tty(struct tty_struct *tty)
592 */ 592 */
593static void x25_asy_close_tty(struct tty_struct *tty) 593static void x25_asy_close_tty(struct tty_struct *tty)
594{ 594{
595 struct x25_asy *sl = (struct x25_asy *) tty->disc_data; 595 struct x25_asy *sl = tty->disc_data;
596 596
597 /* First make sure we're connected. */ 597 /* First make sure we're connected. */
598 if (!sl || sl->magic != X25_ASY_MAGIC) 598 if (!sl || sl->magic != X25_ASY_MAGIC)
@@ -692,7 +692,7 @@ static void x25_asy_unesc(struct x25_asy *sl, unsigned char s)
692static int x25_asy_ioctl(struct tty_struct *tty, struct file *file, 692static int x25_asy_ioctl(struct tty_struct *tty, struct file *file,
693 unsigned int cmd, unsigned long arg) 693 unsigned int cmd, unsigned long arg)
694{ 694{
695 struct x25_asy *sl = (struct x25_asy *) tty->disc_data; 695 struct x25_asy *sl = tty->disc_data;
696 696
697 /* First make sure we're connected. */ 697 /* First make sure we're connected. */
698 if (!sl || sl->magic != X25_ASY_MAGIC) 698 if (!sl || sl->magic != X25_ASY_MAGIC)