From 8d9a9ed7395e16dfc7ddd30a12607241c52c230e Mon Sep 17 00:00:00 2001 From: Jean Tourrilhes Date: Fri, 5 Sep 2003 13:08:43 -0400 Subject: [PATCH] [irda] irtty cleanup o [FEATURE] Finish removing traces of old irtty driver --- drivers/net/irda/act200l.c | 1 - drivers/net/irda/girbil.c | 1 - drivers/net/irda/ma600.c | 1 - drivers/net/irda/mcp2120.c | 1 - drivers/net/irda/tekram.c | 1 - include/net/irda/irtty.h | 80 -------------------------------------- net/irda/timer.c | 2 +- net/irda/wrapper.c | 1 - 8 files changed, 1 insertion(+), 87 deletions(-) delete mode 100644 include/net/irda/irtty.h diff --git a/drivers/net/irda/act200l.c b/drivers/net/irda/act200l.c index cdc58c1200182..78b3df1d18d3b 100644 --- a/drivers/net/irda/act200l.c +++ b/drivers/net/irda/act200l.c @@ -25,7 +25,6 @@ #include #include -#include 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 27e2c98868416..41152c0cefa77 100644 --- a/drivers/net/irda/girbil.c +++ b/drivers/net/irda/girbil.c @@ -29,7 +29,6 @@ #include #include -#include 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 bce6e7adba900..9919b2bbfa985 100644 --- a/drivers/net/irda/ma600.c +++ b/drivers/net/irda/ma600.c @@ -41,7 +41,6 @@ #include #include -#include #ifndef NDEBUG #undef IRDA_DEBUG diff --git a/drivers/net/irda/mcp2120.c b/drivers/net/irda/mcp2120.c index 4024f9d22b88f..25938d4acb1c4 100644 --- a/drivers/net/irda/mcp2120.c +++ b/drivers/net/irda/mcp2120.c @@ -25,7 +25,6 @@ #include #include -#include 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 b4e76f4ef8d73..319a860338a99 100644 --- a/drivers/net/irda/tekram.c +++ b/drivers/net/irda/tekram.c @@ -29,7 +29,6 @@ #include #include -#include 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 index 92caefb1a82b7..0000000000000 --- a/include/net/irda/irtty.h +++ /dev/null @@ -1,80 +0,0 @@ -/********************************************************************* - * - * Filename: irtty.h - * Version: 1.0 - * Description: - * Status: Experimental. - * Author: Dag Brattli - * Created at: Tue Dec 9 21:13:12 1997 - * Modified at: Tue Jan 25 09:10:18 2000 - * Modified by: Dag Brattli - * - * 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 -#include -#include -#include - -#include -#include - -/* 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 3188c1de0e2fe..b14e3f703b289 100644 --- a/net/irda/timer.c +++ b/net/irda/timer.c @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/net/irda/wrapper.c b/net/irda/wrapper.c index d6f3657d6aace..94950ff869624 100644 --- a/net/irda/wrapper.c +++ b/net/irda/wrapper.c @@ -32,7 +32,6 @@ #include #include -#include #include #include #include -- 2.53.0