diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c index 472a2af..856aa98 100644 --- a/drivers/isdn/hardware/mISDN/avmfritz.c +++ b/drivers/isdn/hardware/mISDN/avmfritz.c @@ -21,6 +21,7 @@ * */ #include +#include #include #include #include diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index c9367c3..fc0b137 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c @@ -165,6 +165,7 @@ #define HFC_MULTI_VERSION "2.03" #include +#include #include #include #include diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c index 4343aba..181518b 100644 --- a/drivers/isdn/hardware/mISDN/hfcpci.c +++ b/drivers/isdn/hardware/mISDN/hfcpci.c @@ -45,6 +45,7 @@ */ #include +#include #include #include #include diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c index bc0529a..6ca91e4 100644 --- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c +++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c @@ -39,6 +39,7 @@ */ #include +#include #include #include #include diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c index d13fa5b..6f30f04 100644 --- a/drivers/isdn/hardware/mISDN/mISDNisar.c +++ b/drivers/isdn/hardware/mISDN/mISDNisar.c @@ -25,6 +25,8 @@ */ /* #define DEBUG */ +#include +#include #include #include #include diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c index 9e07246..925818d 100644 --- a/drivers/isdn/hardware/mISDN/speedfax.c +++ b/drivers/isdn/hardware/mISDN/speedfax.c @@ -23,6 +23,7 @@ */ #include +#include #include #include #include diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c index 9e84870..669e9a1 100644 --- a/drivers/isdn/hardware/mISDN/w6692.c +++ b/drivers/isdn/hardware/mISDN/w6692.c @@ -22,6 +22,7 @@ */ #include +#include #include #include #include diff --git a/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c b/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c index 88d16a0..0f06248 100644 --- a/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c +++ b/drivers/isdn/hardware/mISDN/xhfc_pci2pi.c @@ -21,6 +21,7 @@ * */ +#include #include #include #include @@ -29,8 +30,7 @@ static int card_cnt = 0; static LIST_HEAD(card_list); -static rwlock_t card_lock = RW_LOCK_UNLOCKED; - +static DEFINE_RWLOCK(card_lock); static struct pci_device_id xhfc_ids[] = { { diff --git a/drivers/isdn/hardware/mISDN/xhfc_su.c b/drivers/isdn/hardware/mISDN/xhfc_su.c index eb76d14..3a8dfed 100644 --- a/drivers/isdn/hardware/mISDN/xhfc_su.c +++ b/drivers/isdn/hardware/mISDN/xhfc_su.c @@ -26,6 +26,7 @@ * G - common mISDN debug flags described at mISDNhw.h */ #include +#include #include #include #include "xhfc_su.h" diff --git a/drivers/isdn/mISDN/dsp_kb1ec.c b/drivers/isdn/mISDN/dsp_kb1ec.c index cd21f26..b65e891 100644 --- a/drivers/isdn/mISDN/dsp_kb1ec.c +++ b/drivers/isdn/mISDN/dsp_kb1ec.c @@ -30,6 +30,7 @@ #include "dsp.h" #include "dsp_kb1ec.h" #include "dsp_cancel.h" +#include static void *new(const char *arg) { diff --git a/drivers/isdn/mISDN/dsp_mec2.c b/drivers/isdn/mISDN/dsp_mec2.c index 73f667c..4f4b681 100644 --- a/drivers/isdn/mISDN/dsp_mec2.c +++ b/drivers/isdn/mISDN/dsp_mec2.c @@ -24,6 +24,7 @@ * */ +#include #include #include #include "core.h" diff --git a/drivers/isdn/mISDN/dsp_mg2ec.c b/drivers/isdn/mISDN/dsp_mg2ec.c index 7a8ba64..9e66f58 100644 --- a/drivers/isdn/mISDN/dsp_mg2ec.c +++ b/drivers/isdn/mISDN/dsp_mg2ec.c @@ -24,6 +24,7 @@ * */ +#include #include #include #include "core.h" diff --git a/drivers/isdn/mISDN/dsp_octwareec.c b/drivers/isdn/mISDN/dsp_octwareec.c index 2ad481f..8b0946a 100644 --- a/drivers/isdn/mISDN/dsp_octwareec.c +++ b/drivers/isdn/mISDN/dsp_octwareec.c @@ -24,6 +24,7 @@ * */ +#include #include #include #include "core.h" diff --git a/drivers/isdn/mISDN/dsp_oslec.c b/drivers/isdn/mISDN/dsp_oslec.c index 319a070..1374198 100644 --- a/drivers/isdn/mISDN/dsp_oslec.c +++ b/drivers/isdn/mISDN/dsp_oslec.c @@ -26,6 +26,7 @@ * */ +#include #include #include #include "core.h" diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c index 621f310..c784e38 100644 --- a/drivers/isdn/mISDN/dsp_pipeline.c +++ b/drivers/isdn/mISDN/dsp_pipeline.c @@ -32,6 +32,7 @@ #include #include "dsp.h" #include "dsp_hwec.h" +#include /* uncomment for debugging */ /*#define PIPELINE_DEBUG*/ diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c index f6e108d..4ab4ea5 100644 --- a/drivers/isdn/mISDN/hwchannel.c +++ b/drivers/isdn/mISDN/hwchannel.c @@ -110,7 +110,7 @@ mISDN_freedchannel(struct dchannel *ch) } skb_queue_purge(&ch->squeue); skb_queue_purge(&ch->rqueue); - flush_work_sync(&ch->workq); + flush_scheduled_work(); return 0; } EXPORT_SYMBOL(mISDN_freedchannel); @@ -143,7 +143,7 @@ mISDN_freebchannel(struct bchannel *ch) mISDN_clear_bchannel(ch); skb_queue_purge(&ch->rqueue); ch->rcount = 0; - flush_work_sync(&ch->workq); + flush_scheduled_work(); return 0; } EXPORT_SYMBOL(mISDN_freebchannel); diff --git a/drivers/isdn/mISDN/octvqe/octvqe_linux.c b/drivers/isdn/mISDN/octvqe/octvqe_linux.c index 70198db..8e49fa9 100644 --- a/drivers/isdn/mISDN/octvqe/octvqe_linux.c +++ b/drivers/isdn/mISDN/octvqe/octvqe_linux.c @@ -1111,7 +1111,7 @@ static struct file_operations octdev_fops = { write: octdev_write, release: octdev_release, poll: octdev_poll, - ioctl: octdev_ioctl, + unlocked_ioctl: octdev_ioctl, }; static int octvqe_init(void) diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index 7446d8b..160ac77 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c @@ -18,7 +18,7 @@ #include #include #include "core.h" - +#include static u_int *debug; static struct proto mISDN_proto = { \ No newline at end of file