[irda] irtty cleanup

	o [FEATURE] Finish removing traces of old irtty driver

diff --git a/drivers/net/irda/act200l.c b/drivers/net/irda/act200l.c
index cdc58c1200182f4f919f7354f49795858dd23e61..78b3df1d18d3bf870e3ebf3f40f8eba7b25782d0 100644 (file)
--- a/drivers/net/irda/act200l.c
+++ b/drivers/net/irda/act200l.c
@@ -25,7 +25,6 @@
 
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>
-#include <net/irda/irtty.h>
 
 static int  act200l_reset(struct irda_task *task);
 static void act200l_open(dongle_t *self, struct qos_info *qos);

diff --git a/drivers/net/irda/girbil.c b/drivers/net/irda/girbil.c
index 27e2c988684168067fbf9277b82896b5bf74274a..41152c0cefa77bef32761fd610147eab61f3908e 100644 (file)
--- a/drivers/net/irda/girbil.c
+++ b/drivers/net/irda/girbil.c
@@ -29,7 +29,6 @@
 
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>
-#include <net/irda/irtty.h>
 
 static int  girbil_reset(struct irda_task *task);
 static void girbil_open(dongle_t *self, struct qos_info *qos);

diff --git a/drivers/net/irda/ma600.c b/drivers/net/irda/ma600.c
index bce6e7adba90034af0178f9bdade25c67ae561b3..9919b2bbfa985ea2bc8fb2d711276c1b986dc960 100644 (file)
--- a/drivers/net/irda/ma600.c
+++ b/drivers/net/irda/ma600.c
@@ -41,7 +41,6 @@
 
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>
-#include <net/irda/irtty.h>
 
 #ifndef NDEBUG
        #undef IRDA_DEBUG

diff --git a/drivers/net/irda/mcp2120.c b/drivers/net/irda/mcp2120.c
index 4024f9d22b88f47f0e11fdaee6e5d4e1a2b318c2..25938d4acb1c41afffbf27f20cf21b63043027a8 100644 (file)
--- a/drivers/net/irda/mcp2120.c
+++ b/drivers/net/irda/mcp2120.c
@@ -25,7 +25,6 @@
 
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>
-#include <net/irda/irtty.h>
 
 static int  mcp2120_reset(struct irda_task *task);
 static void mcp2120_open(dongle_t *self, struct qos_info *qos);

diff --git a/drivers/net/irda/tekram.c b/drivers/net/irda/tekram.c
index b4e76f4ef8d739f5b2056997b6c32a295e167a2b..319a860338a99b8ae5617ded62be93e6e00a5aca 100644 (file)
--- a/drivers/net/irda/tekram.c
+++ b/drivers/net/irda/tekram.c
@@ -29,7 +29,6 @@
 
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>
-#include <net/irda/irtty.h>
 
 static void tekram_open(dongle_t *self, struct qos_info *qos);
 static void tekram_close(dongle_t *self);

diff --git a/include/net/irda/irtty.h b/include/net/irda/irtty.h
deleted file mode 100644 (file)
index 92caefb..0000000
--- a/include/net/irda/irtty.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*********************************************************************
- *                
- * Filename:      irtty.h
- * Version:       1.0
- * Description:   
- * Status:        Experimental.
- * Author:        Dag Brattli <dagb@cs.uit.no>
- * Created at:    Tue Dec  9 21:13:12 1997
- * Modified at:   Tue Jan 25 09:10:18 2000
- * Modified by:   Dag Brattli <dagb@cs.uit.no>
- *  
- *     Copyright (c) 1997, 1999-2000 Dag Brattli, All Rights Reserved.
- *      
- *     This program is free software; you can redistribute it and/or 
- *     modify it under the terms of the GNU General Public License as 
- *     published by the Free Software Foundation; either version 2 of 
- *     the License, or (at your option) any later version.
- *  
- *     Neither Dag Brattli nor University of Tromsø admit liability nor
- *     provide warranty for any of this software. This material is 
- *     provided "AS-IS" and at no charge.
- *     
- ********************************************************************/
-
-#ifndef IRTTY_H
-#define IRTTY_H
-
-#include <linux/if.h>
-#include <linux/skbuff.h>
-#include <linux/termios.h>
-#include <linux/netdevice.h>
-
-#include <net/irda/irda.h>
-#include <net/irda/irda_device.h>
-
-/* Used by ioctl */
-struct irtty_info {
-       char name[6];
-};
-
-#define IRTTY_IOC_MAGIC 'e'
-#define IRTTY_IOCTDONGLE  _IO(IRTTY_IOC_MAGIC, 1)
-#define IRTTY_IOCGET     _IOR(IRTTY_IOC_MAGIC, 2, struct irtty_info)
-#define IRTTY_IOC_MAXNR   2
-
-struct irtty_cb {
-       magic_t magic;
-
-       struct net_device *netdev; /* Yes! we are some kind of netdevice */
-       struct irda_task *task;
-       struct net_device_stats stats;
-
-       struct tty_struct  *tty;
-       struct irlap_cb    *irlap; /* The link layer we are binded to */
-
-       chipio_t io;               /* IrDA controller information */
-       iobuff_t tx_buff;          /* Transmit buffer */
-       iobuff_t rx_buff;          /* Receive buffer */
-
-       struct qos_info qos;       /* QoS capabilities for this device */
-       dongle_t *dongle;          /* Dongle driver */
-
-
-       spinlock_t lock;           /* For serializing operations */
-
-       __u32 new_speed;
-       __u32 flags;               /* Interface flags */
-
-       INFRARED_MODE mode;
-};
- 
-int irtty_register_dongle(struct dongle_reg *dongle);
-void irtty_unregister_dongle(struct dongle_reg *dongle);
-
-#endif
-
-
-
-
-

diff --git a/net/irda/timer.c b/net/irda/timer.c
index 3188c1de0e2fe7b8007222744dd89b0780ec1e7c..b14e3f703b2896dc7cf9bc7c79faa62cd967e4ea 100644 (file)
--- a/net/irda/timer.c
+++ b/net/irda/timer.c
@@ -30,7 +30,7 @@
 
 #include <net/irda/timer.h>
 #include <net/irda/irda.h>
-#include <net/irda/irtty.h>
+#include <net/irda/irda_device.h>
 #include <net/irda/irlap.h>
 #include <net/irda/irlmp.h>
 

diff --git a/net/irda/wrapper.c b/net/irda/wrapper.c
index d6f3657d6aace2558e0174f7117c5c03c8874380..94950ff86962494c84d187d1c869d315a548fdaa 100644 (file)
--- a/net/irda/wrapper.c
+++ b/net/irda/wrapper.c
@@ -32,7 +32,6 @@
 
 #include <net/irda/irda.h>
 #include <net/irda/wrapper.h>
-#include <net/irda/irtty.h>
 #include <net/irda/crc.h>
 #include <net/irda/irlap.h>
 #include <net/irda/irlap_frame.h>