diff options
| author | Christoph Hellwig <hch@lst.de> | 2006-05-09 15:27:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-05-09 15:27:04 -0700 |
| commit | 788252e6616afc75098397cc6b0bcb5482ad07ac (patch) | |
| tree | f2ae7d8baf6a139abcdcac8fe07f9ed7af3ca85e /drivers/net/irda/sir-dev.h | |
| parent | d94c77b9b55f2c868ffd63cbd1f9749755c4b3d0 (diff) | |
| download | linux-788252e6616afc75098397cc6b0bcb5482ad07ac.tar.gz linux-788252e6616afc75098397cc6b0bcb5482ad07ac.tar.bz2 linux-788252e6616afc75098397cc6b0bcb5482ad07ac.zip | |
[IRDA]: Switching to a workqueue for the SIR work
Since sir_kthread.c pretty much duplicates the workqueue
functionality, we'd better switch. The SIR fsm has been merged into
sir_dev.c and thus sir_kthread.c is deleted.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Samuel Ortiz <samuel.ortiz@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda/sir-dev.h')
| -rw-r--r-- | drivers/net/irda/sir-dev.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/irda/sir-dev.h b/drivers/net/irda/sir-dev.h index f69fb4cec76f..9fa294a546d6 100644 --- 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; |