Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / irda / sir-dev.h

diff --git a/drivers/net/irda/sir-dev.h b/drivers/net/irda/sir-dev.h
index f0b8bc3637e5843790fb949ee3eeb5c6d8777abc..9fa294a546d625bd78070ac9f5947b30607f6674 100644 (file)
--- a/drivers/net/irda/sir-dev.h
+++ b/drivers/net/irda/sir-dev.h
@@ -15,23 +15,14 @@
 #define IRDA_SIR_H
 
 #include <linux/netdevice.h>
+#include <linux/workqueue.h>
 
 #include <net/irda/irda.h>
 #include <net/irda/irda_device.h>              // iobuff_t
 
-/* FIXME: unify irda_request with sir_fsm! */
-
-struct irda_request {
-       struct list_head lh_request;
-       unsigned long pending;
-       void (*func)(void *);
-       void *data;
-       struct timer_list timer;
-};
-
 struct sir_fsm {
        struct semaphore        sem;
-       struct irda_request     rq;
+       struct work_struct      work;
        unsigned                state, substate;
        int                     param;
        int                     result;
@@ -133,8 +124,6 @@ extern int sirdev_put_dongle(struct sir_dev *self);
 
 extern void sirdev_enable_rx(struct sir_dev *dev);
 extern int sirdev_schedule_request(struct sir_dev *dev, int state, unsigned param);
-extern int __init irda_thread_create(void);
-extern void __exit irda_thread_join(void);
 
 /* inline helpers */