Importing files for 2.6.1-rc1 release.

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/tags/2.6.1-rc1@10580 a0bf4364-ded3-4de4-8d8a-66a801d63aff

.version

@@ -1 +1 @@
-2.6.1
+2.6.1-rc1

drivers/dahdi/dahdi-base.c

@@ -122,6 +122,7 @@ EXPORT_SYMBOL(dahdi_qevent_nolock);
 EXPORT_SYMBOL(dahdi_qevent_lock);
 EXPORT_SYMBOL(dahdi_hooksig);
 EXPORT_SYMBOL(dahdi_alarm_notify);
+EXPORT_SYMBOL(dahdi_set_dynamic_ioctl);
 EXPORT_SYMBOL(dahdi_hdlc_abort);
 EXPORT_SYMBOL(dahdi_hdlc_finish);
 EXPORT_SYMBOL(dahdi_hdlc_getbuf);
@@ -2463,11 +2464,12 @@ static ssize_t dahdi_chan_write(struct file *file, const char __user *usrbuf,
 		if ((chan->ec_state) &&
 		    (ECHO_MODE_ACTIVE == chan->ec_state->status.mode) &&
 		    (chan->ec_state->ops->echocan_process_tx)) {
-			struct dahdi_echocan_state *const ec = chan->ec_state;
+			struct ec_state *const ec_state = chan->ec_state;
 			for (x = 0; x < chan->writen[res]; ++x) {
 				short tx;
 				tx = DAHDI_XLAW(chan->writebuf[res][x], chan);
-				ec->ops->echocan_process_tx(ec, &tx, 1);
+				ec_state->ops->echocan_process_tx(ec_state,
+								  &tx, 1);
 				chan->writebuf[res][x] = DAHDI_LIN2X((int) tx,
 								     chan);
 			}
@@ -4420,14 +4422,12 @@ static int dahdi_common_ioctl(struct file *file, unsigned int cmd,
 	return 0;
 }
 
-static const struct dahdi_dynamic_ops *dahdi_dynamic_ops;
-void dahdi_set_dynamic_ops(const struct dahdi_dynamic_ops *ops)
+static int (*dahdi_dynamic_ioctl)(unsigned int cmd, unsigned long data);
+
+void dahdi_set_dynamic_ioctl(int (*func)(unsigned int cmd, unsigned long data))
 {
-	mutex_lock(&registration_mutex);
-	dahdi_dynamic_ops = ops;
-	mutex_unlock(&registration_mutex);
+	dahdi_dynamic_ioctl = func;
 }
-EXPORT_SYMBOL(dahdi_set_dynamic_ops);
 
 static int (*dahdi_hpec_ioctl)(unsigned int cmd, unsigned long data);
 
@@ -4648,6 +4648,7 @@ static int dahdi_ioctl_chanconfig(struct file *file, unsigned long data)
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 23)
 				SET_MODULE_OWNER(chan->hdlcnetdev->netdev);
 #endif
+				chan->hdlcnetdev->netdev->irq = chan->span->irq;
 				chan->hdlcnetdev->netdev->tx_queue_len = 50;
 #ifdef HAVE_NET_DEVICE_OPS
 				chan->hdlcnetdev->netdev->netdev_ops = &dahdi_netdev_ops;
@@ -5145,33 +5146,6 @@ static int dahdi_ioctl_maint(unsigned long data)
 	return 0;
 }
 
-static int dahdi_ioctl_dynamic(unsigned int cmd, unsigned long data)
-{
-	bool tried_load = false;
-	int res;
-
-retry_check:
-	mutex_lock(&registration_mutex);
-	if (!dahdi_dynamic_ops) {
-		mutex_unlock(&registration_mutex);
-		if (tried_load)
-			return -ENOSYS;
-
-		request_module("dahdi_dynamic");
-		tried_load = true;
-		goto retry_check;
-	}
-	if (!try_module_get(dahdi_dynamic_ops->owner)) {
-		mutex_unlock(&registration_mutex);
-		return -ENOSYS;
-	}
-	mutex_unlock(&registration_mutex);
-
-	res = dahdi_dynamic_ops->ioctl(cmd, data);
-	module_put(dahdi_dynamic_ops->owner);
-	return res;
-}
-
 static int
 dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 {
@@ -5206,7 +5180,14 @@ dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long data)
 		return dahdi_ioctl_maint(data);
 	case DAHDI_DYNAMIC_CREATE:
 	case DAHDI_DYNAMIC_DESTROY:
-		return dahdi_ioctl_dynamic(cmd, data);
+		if (dahdi_dynamic_ioctl) {
+			return dahdi_dynamic_ioctl(cmd, data);
+		} else {
+			request_module("dahdi_dynamic");
+			if (dahdi_dynamic_ioctl)
+				return dahdi_dynamic_ioctl(cmd, data);
+		}
+		return -ENOSYS;
 	case DAHDI_EC_LICENSE_CHALLENGE:
 	case DAHDI_EC_LICENSE_RESPONSE:
 		if (dahdi_hpec_ioctl) {
@@ -9976,7 +9957,7 @@ static void watchdog_check(unsigned long ignored)
 	static int wdcheck=0;
 	struct dahdi_span *s;
 
-	spin_lock_irqsave(&chan_lock, flags);
+	spin_lock_irqsave(&span_list_lock, flags);
 	list_for_each_entry(s, &span_list, spans_node) {
 		if (s->flags & DAHDI_FLAG_RUNNING) {
 			if (s->watchcounter == DAHDI_WATCHDOG_INIT) {
@@ -9984,9 +9965,9 @@ static void watchdog_check(unsigned long ignored)
 				if ((s->watchstate == DAHDI_WATCHSTATE_OK) ||
 					(s->watchstate == DAHDI_WATCHSTATE_UNKNOWN)) {
 					s->watchstate = DAHDI_WATCHSTATE_RECOVERING;
-					if (s->ops->watchdog) {
+					if (s->watchdog) {
 						module_printk(KERN_NOTICE, "Kicking span %s\n", s->name);
-						s->ops->watchdog(s, DAHDI_WATCHDOG_NOINTS);
+						s->watchdog(spans[x], DAHDI_WATCHDOG_NOINTS);
 					} else {
 						module_printk(KERN_NOTICE, "Span %s is dead with no revival\n", s->name);
 						s->watchstate = DAHDI_WATCHSTATE_FAILED;
@@ -10001,7 +9982,7 @@ static void watchdog_check(unsigned long ignored)
 			s->watchcounter = DAHDI_WATCHDOG_INIT;
 		}
 	}
-	spin_unlock_irqrestore(&chan_lock, flags);
+	spin_unlock_irqrestore(&span_list_lock, flags);
 	if (!wdcheck) {
 		module_printk(KERN_NOTICE, "watchdog on duty!\n");
 		wdcheck=1;

drivers/dahdi/dahdi_dummy.c

@@ -53,7 +53,7 @@
 #if defined(USE_HIGHRESTIMER)
 #include <linux/hrtimer.h>
 #else
-#include <linux/timer.h>
+#include <linux/time.h>
 #endif
 
 #include <dahdi/kernel.h>

drivers/dahdi/dahdi_dynamic.c

@@ -385,6 +385,16 @@ static void dahdi_dynamic_release(struct kref *kref)
 
 	WARN_ON(test_bit(DAHDI_FLAGBIT_REGISTERED, &d->span.flags));
 
+	if (d->pvt) {
+		if (d->driver && d->driver->destroy) {
+			__module_get(d->driver->owner);
+			d->driver->destroy(d);
+			module_put(d->driver->owner);
+		} else {
+			WARN_ON(1);
+		}
+	}
+
 	kfree(d->msgbuf);
 
 	for (x = 0; x < d->span.channels; x++)
@@ -460,24 +470,6 @@ static int _destroy_dynamic(struct dahdi_dynamic_span *dds)
 		return -EBUSY;
 	}
 
-	if (d->pvt) {
-		if (d->driver && d->driver->destroy) {
-			if (!try_module_get(d->driver->owner)) {
-				/* The driver for this device is in the
-				 * process of unloading. Leave this dynamic on
-				 * the list so it's cleaned up when the driver
-				 * unregisters. */
-				 dynamic_put(d);
-				 return -ENXIO;
-			}
-			d->driver->destroy(d);
-			module_put(d->driver->owner);
-		} else {
-			WARN_ON(1);
-		}
-		d->pvt = NULL;
-	}
-
 	dahdi_unregister_device(d->ddev);
 
 	spin_lock_irqsave(&dspan_lock, flags);
@@ -775,17 +767,19 @@ void dahdi_dynamic_unregister_driver(struct dahdi_dynamic_driver *dri)
 	list_for_each_entry_safe(d, n, &dspan_list, list) {
 		if (d->driver == dri) {
 			if (d->pvt) {
-				if (d->driver && d->driver->destroy)
+				if (d->driver && d->driver->destroy) {
+					__module_get(d->driver->owner);
 					d->driver->destroy(d);
-				else
+					module_put(d->driver->owner);
+				} else {
 					WARN_ON(1);
+				}
 			}
 			dahdi_unregister_device(d->ddev);
 			spin_lock_irqsave(&dspan_lock, flags);
 			list_del_rcu(&d->list);
 			spin_unlock_irqrestore(&dspan_lock, flags);
 			synchronize_rcu();
-			d->driver = NULL;
 			dynamic_put(d);
 		}
 	}
@@ -829,13 +823,10 @@ static void check_for_red_alarm(unsigned long ignored)
 	mod_timer(&alarmcheck, jiffies + 1 * HZ);
 }
 
-static const struct dahdi_dynamic_ops dahdi_dynamic_ops = {
-	.owner = THIS_MODULE,
-	.ioctl = dahdi_dynamic_ioctl,
-};
-
 static int dahdi_dynamic_init(void)
 {
+	dahdi_set_dynamic_ioctl(dahdi_dynamic_ioctl);
+
 	/* Start process to check for RED ALARM */
 	init_timer(&alarmcheck);
 	alarmcheck.expires = 0;
@@ -846,25 +837,19 @@ static int dahdi_dynamic_init(void)
 #ifdef ENABLE_TASKLETS
 	tasklet_init(&dahdi_dynamic_tlet, dahdi_dynamic_tasklet, 0);
 #endif
-	dahdi_set_dynamic_ops(&dahdi_dynamic_ops);
-
 	printk(KERN_INFO "DAHDI Dynamic Span support LOADED\n");
 	return 0;
 }
 
 static void dahdi_dynamic_cleanup(void)
 {
-	dahdi_set_dynamic_ops(NULL);
-
 #ifdef ENABLE_TASKLETS
 	if (taskletpending) {
 		tasklet_disable(&dahdi_dynamic_tlet);
 		tasklet_kill(&dahdi_dynamic_tlet);
 	}
 #endif
-	del_timer_sync(&alarmcheck);
-	/* Must call again in case it was running before and rescheduled
-	 * itself. */
+	dahdi_set_dynamic_ioctl(NULL);
 	del_timer(&alarmcheck);
 	printk(KERN_INFO "DAHDI Dynamic Span support unloaded\n");
 }

drivers/dahdi/dahdi_dynamic_eth.c

@@ -71,8 +71,6 @@ static struct dahdi_span *ztdeth_getspan(unsigned char *addr, unsigned short sub
 	if (z)
 		span = z->span;
 	spin_unlock_irqrestore(&zlock, flags);
-	if (!span || !test_bit(DAHDI_FLAGBIT_REGISTERED, &span->flags))
-		return NULL;
 	return span;
 }
 
@@ -154,7 +152,7 @@ static void ztdeth_transmit(struct dahdi_dynamic *dyn, u8 *msg, size_t msglen)
 
 	spin_lock_irqsave(&zlock, flags);
 	z = dyn->pvt;
-	if (z && z->dev) {
+	if (z->dev) {
 		/* Copy fields to local variables to remove spinlock ASAP */
 		dev = z->dev;
 		memcpy(addr, z->addr, sizeof(z->addr));
@@ -315,12 +313,11 @@ static void ztdeth_destroy(struct dahdi_dynamic *dyn)
 		prev = cur;
 		cur = cur->next;
 	}
+	spin_unlock_irqrestore(&zlock, flags);
 	if (cur == z) {	/* Successfully removed */
-		dyn->pvt = NULL;
 		printk(KERN_INFO "TDMoE: Removed interface for %s\n", z->span->name);
 		kfree(z);
 	}
-	spin_unlock_irqrestore(&zlock, flags);
 }
 
 static int ztdeth_create(struct dahdi_dynamic *dyn, const char *addr)
@@ -443,27 +440,21 @@ static struct notifier_block ztdeth_nblock = {
 
 static int __init ztdeth_init(void)
 {
-	skb_queue_head_init(&skbs);
-
 	dev_add_pack(&ztdeth_ptype);
 	register_netdevice_notifier(&ztdeth_nblock);
 	dahdi_dynamic_register_driver(&ztd_eth);
 
+	skb_queue_head_init(&skbs);
+
 	return 0;
 }
 
 static void __exit ztdeth_exit(void)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 22)
-	flush_scheduled_work();
-#else
 	cancel_work_sync(&dahdi_dynamic_eth_flush_work);
-#endif
-	dahdi_dynamic_unregister_driver(&ztd_eth);
-	unregister_netdevice_notifier(&ztdeth_nblock);
 	dev_remove_pack(&ztdeth_ptype);
-
-	skb_queue_purge(&skbs);
+	unregister_netdevice_notifier(&ztdeth_nblock);
+	dahdi_dynamic_unregister_driver(&ztd_eth);
 }
 
 MODULE_DESCRIPTION("DAHDI Dynamic TDMoE Support");

drivers/dahdi/dahdi_dynamic_loc.c

@@ -78,11 +78,10 @@ static LIST_HEAD(dynamic_local_list);
 static void
 dahdi_dynamic_local_transmit(struct dahdi_dynamic *dyn, u8 *msg, size_t msglen)
 {
-	struct dahdi_dynamic_local *d;
+	struct dahdi_dynamic_local *const d = dyn->pvt;
 	unsigned long flags;
 
 	spin_lock_irqsave(&local_lock, flags);
-	d = dyn->pvt;
 	if (d && d->peer && d->peer->span) {
 		if (test_bit(DAHDI_FLAGBIT_REGISTERED, &d->peer->span->flags))
 			dahdi_dynamic_receive(d->peer->span, msg, msglen);
@@ -131,12 +130,11 @@ static int digit2int(char d)
 
 static void dahdi_dynamic_local_destroy(struct dahdi_dynamic *dyn)
 {
-	struct dahdi_dynamic_local *d;
+	struct dahdi_dynamic_local *d = dyn->pvt;
 	unsigned long flags;
 	struct dahdi_dynamic_local *cur;
 
 	spin_lock_irqsave(&local_lock, flags);
-	d = dyn->pvt;
 	list_for_each_entry(cur, &dynamic_local_list, node) {
 		if (cur->peer == d)
 			cur->peer = NULL;

drivers/dahdi/firmware/Makefile

@@ -58,7 +58,6 @@ OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=dahdi-fw-oct6114-128.o)
 OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-256=dahdi-fw-oct6114-256.o)
 OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=dahdi-fw-tc400m.o)
 OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-HX8=dahdi-fw-hx8.o)
-OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-VPMOCT032=dahdi-fw-vpmoct032.o)
 
 # Force usage of wget, for now
 DOWNLOAD=wget
@@ -221,8 +220,3 @@ dahdi-fw-oct6114-256.o: dahdi-fw-oct6114-256-$(OCT6114_256_VERSION).tar.gz dahdi
 dahdi-fw-tc400m.o: dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz dahdi-fw-tc400m.bin make_firmware_object
 	@echo Making firmware object file for dahdi-fw-tc400m.bin
 	./make_firmware_object dahdi-fw-tc400m.bin $@
-
-# Build object file of a VPMOCT032 firmware image for linking
-dahdi-fw-vpmoct032.o: dahdi-fw-vpmoct032-$(VPMOCT032_VERSION).tar.gz dahdi-fw-vpmoct032.bin make_firmware_object
-	@echo Making firmware object file for dahdi-fw-vpmoct032.bin
-	./make_firmware_object dahdi-fw-vpmoct032.bin $@

drivers/dahdi/voicebus/Kbuild

@@ -2,17 +2,4 @@ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_VOICEBUS) += dahdi_voicebus.o
 
 dahdi_voicebus-objs := voicebus.o GpakCust.o GpakApi.o voicebus_net.o vpmoct.o
 
-FIRM_DIR	:= ../firmware
-
-ifneq ($(HOTPLUG_FIRMWARE),yes)
-dahdi_voicebus-objs += $(FIRM_DIR)/dahdi-fw-vpmoct032.o
-$(warning WARNING: You are compiling firmware into voicebus.ko which is not available under the terms of the GPL. It may be a violation of the GPL to distribute the resulting image since it combines both GPL and non-GPL work. You should consult a lawyer of your own before distributing such an image.)
-else
-  EXTRA_CFLAGS+=-DHOTPLUG_FIRMWARE
-endif
-
-EXTRA_CFLAGS += -I$(src)/.. -Wno-undef
-
-$(obj)/$(FIRM_DIR)/dahdi-fw-vpmoct032.o: $(obj)/voicebus.o
-	$(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-vpmoct032.o
-
+EXTRA_CFLAGS := -I$(src)/.. -Wno-undef

drivers/dahdi/voicebus/vpmoct.c

@@ -443,47 +443,6 @@ static void vpmoct_set_defaults(struct vpmoct *vpm)
 	vpmoct_write_dword(vpm, 0x30, 0);
 }
 
-static const char *const FIRMWARE_NAME = "dahdi-fw-vpmoct032.bin";
-#if defined(HOTPLUG_FIRMWARE)
-static int
-vpmoct_request_firmware(const struct firmware **fw, struct device *dev)
-{
-	return request_firmware(fw, FIRMWARE_NAME, dev);
-}
-
-static void vpmoct_release_firmware(const struct firmware *fw)
-{
-	release_firmware(fw);
-}
-#else
-static int
-vpmoct_request_firmware(const struct firmware **fw_p, struct device *dev)
-{
-	struct firmware *fw;
-	extern void _binary_dahdi_fw_vpmoct032_bin_size;
-	extern u8 _binary_dahdi_fw_vpmoct032_bin_start[];
-
-	*fw_p = fw = kzalloc(sizeof(*fw), GFP_KERNEL);
-	if (!fw)
-		return -ENOMEM;
-
-	fw->data = _binary_dahdi_fw_vpmoct032_bin_start;
-	/* Yes... this is weird. objcopy gives us a symbol containing
-	   the size of the firmware, not a pointer a variable containing the
-	   size. The only way we can get the value of the symbol is to take
-	   its address, so we define it as a pointer and then cast that value
-	   to the proper type.  */
-	fw->size = (size_t) &_binary_dahdi_fw_vpmoct032_bin_size;
-
-	return 0;
-}
-
-static void vpmoct_release_firmware(const struct firmware *fw)
-{
-	kfree(fw);
-}
-#endif
-
 /**
  * vpmoct_load_flash - Check the current flash version and possibly load.
  * @vpm:  The VPMOCT032 module to check / load.
@@ -504,9 +463,10 @@ static void vpmoct_load_flash(struct work_struct *data)
 	const struct firmware *fw;
 	const struct vpmoct_header *header;
 	char serial[VPMOCT_SERIAL_SIZE+1];
+	const char *const FIRMWARE_NAME = "dahdi-fw-vpmoct032.bin";
 	int i;
 
-	res = vpmoct_request_firmware(&fw, vpm->dev);
+	res = request_firmware(&fw, FIRMWARE_NAME, vpm->dev);
 	if (res) {
 		dev_warn(vpm->dev,
 			 "vpmoct: Failed to load firmware from userspace! %d\n",
@@ -545,7 +505,7 @@ static void vpmoct_load_flash(struct work_struct *data)
 				 FIRMWARE_NAME);
 
 			/* Just use the old version of the fimware. */
-			vpmoct_release_firmware(fw);
+			release_firmware(fw);
 			vpmoct_set_defaults(vpm);
 			vpmoct_load_complete(work, true);
 			return;
@@ -554,7 +514,7 @@ static void vpmoct_load_flash(struct work_struct *data)
 		if (vpm->minor == header->minor &&
 		    vpm->major == header->major) {
 			/* Proper version is running */
-			vpmoct_release_firmware(fw);
+			release_firmware(fw);
 			vpmoct_set_defaults(vpm);
 			vpmoct_load_complete(work, true);
 			return;
@@ -588,14 +548,14 @@ static void vpmoct_load_flash(struct work_struct *data)
 	if (vpmoct_check_firmware_crc(vpm, fw->size-VPMOCT_FIRM_HEADER_LEN*2,
 					header->major, header->minor))
 		goto error;
-	vpmoct_release_firmware(fw);
+	release_firmware(fw);
 	vpmoct_set_defaults(vpm);
 	vpmoct_load_complete(work, true);
 	return;
 
 error:
 	dev_info(vpm->dev, "Unable to load firmware\n");
-	vpmoct_release_firmware(fw);
+	release_firmware(fw);
 	/* TODO: Should we disable module if the firmware doesn't load? */
 	vpmoct_load_complete(work, false);
 	return;

drivers/dahdi/wcb4xxp/base.c

@@ -35,6 +35,7 @@
 #include <linux/spinlock.h>
 #include <linux/device.h>	/* dev_err() */
 #include <linux/interrupt.h>
+#include <asm/system.h>		/* cli(), *_flags */
 #include <asm/uaccess.h>	/* copy_*_user */
 #include <linux/workqueue.h>	/* work_struct */
 #include <linux/timer.h>	/* timer_struct */

drivers/dahdi/wct4xxp/Kbuild

@@ -18,7 +18,6 @@ wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper object
 
 ifneq ($(HOTPLUG_FIRMWARE),yes)
 wct4xxp-objs += $(FIRM_DIR)/dahdi-fw-oct6114-064.o $(FIRM_DIR)/dahdi-fw-oct6114-128.o $(FIRM_DIR)/dahdi-fw-oct6114-256.o
-$(warning WARNING: You are compiling firmware into wct4xxp.ko which is not available under the terms of the GPL. It may be a violation of the GPL to distribute the resulting image since it combines both GPL and non-GPL work. You should consult a lawyer of your own before distributing such an image.)
 endif
 
 $(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-064.o: $(obj)/base.o

drivers/dahdi/wct4xxp/base.c

@@ -3784,7 +3784,7 @@ static inline void t4_framer_interrupt(struct t4 *wc, int span)
 }
 
 #ifdef SUPPORT_GEN1
-static irqreturn_t _t4_interrupt(int irq, void *dev_id)
+DAHDI_IRQ_HANDLER(t4_interrupt)
 {
 	struct t4 *wc = dev_id;
 	unsigned long flags;
@@ -3852,16 +3852,6 @@ static irqreturn_t _t4_interrupt(int irq, void *dev_id)
 
 	return IRQ_RETVAL(1);
 }
-
-DAHDI_IRQ_HANDLER(t4_interrupt)
-{
-	irqreturn_t ret;
-	unsigned long flags;
-	local_irq_save(flags);
-	ret = _t4_interrupt(irq, dev_id);
-	local_irq_restore(flags);
-	return ret;
-}
 #endif
 
 static int t4_allocate_buffers(struct t4 *wc, int numbufs,
@@ -3979,7 +3969,7 @@ static void t4_isr_bh(unsigned long data)
 #endif
 }
 
-static irqreturn_t _t4_interrupt_gen2(int irq, void *dev_id)
+DAHDI_IRQ_HANDLER(t4_interrupt_gen2)
 {
 	struct t4 *wc = dev_id;
 	unsigned int status;
@@ -4175,16 +4165,6 @@ out:
 	return IRQ_RETVAL(1);
 }
 
-DAHDI_IRQ_HANDLER(t4_interrupt_gen2)
-{
-	irqreturn_t ret;
-	unsigned long flags;
-	local_irq_save(flags);
-	ret = _t4_interrupt_gen2(irq, dev_id);
-	local_irq_restore(flags);
-	return ret;
-}
-
 #ifdef SUPPORT_GEN1
 static int t4_reset_dma(struct t4 *wc)
 {
@@ -5232,23 +5212,22 @@ t4_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 #ifdef SUPPORT_GEN1
 	if (request_irq(pdev->irq, (wc->devtype->flags & FLAG_2NDGEN) ?
 					t4_interrupt_gen2 : t4_interrupt,
-			DAHDI_IRQ_SHARED,
+			DAHDI_IRQ_SHARED_DISABLED,
 			(wc->numspans == 8) ? "wct8xxp" :
 					      (wc->numspans == 2) ? "wct2xxp" :
 								    "wct4xxp",
-			wc)) {
+			wc))
 #else
-	if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) {
-		dev_notice(&wc->dev->dev, "This driver does not "
-				"support 1st gen modules\n");
-		free_wc(wc);
-		return -ENODEV;
-	}
-
-	if (request_irq(pdev->irq, t4_interrupt_gen2,
-			DAHDI_IRQ_SHARED, "t4xxp", wc)) {
+		if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) {
+			dev_notice(&wc->dev->dev, "This driver does not "
+					"support 1st gen modules\n");
+			free_wc(wc);
+			return -ENODEV;
+		}	
+	if (request_irq(pdev->irq, t4_interrupt_gen2, DAHDI_IRQ_SHARED_DISABLED, "t4xxp", wc)) 
 #endif
-		dev_notice(&wc->dev->dev, "Unable to request IRQ %d\n",
+	{
+		dev_notice(&wc->dev->dev, "t4xxp: Unable to request IRQ %d\n",
 				pdev->irq);
 		free_wc(wc);
 		return -EIO;

drivers/dahdi/wctdm24xxp/base.c

@@ -1073,22 +1073,9 @@ wctdm_isr_getreg(struct wctdm *wc, struct wctdm_module *const mod, u8 address)
 	list_add(&cmd->node, &mod->pending_cmds);
 }
 
-/* Must be called with wc.reglock held and local interrupts disabled */
 static inline void
-wctdm_setreg_intr(struct wctdm *wc, struct wctdm_module *mod, int addr, int val)
-{
-	struct wctdm_cmd *cmd;
-
-	cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC);
-	if (unlikely(!cmd))
-		return;
-
-	cmd->complete = NULL;
-	cmd->cmd = CMD_WR(addr, val);
-
-	list_add_tail(&cmd->node, &mod->pending_cmds);
-}
-
+wctdm_setreg_intr(struct wctdm *wc, struct wctdm_module *mod,
+		  int addr, int val);
 
 static void cmd_checkisr(struct wctdm *wc, struct wctdm_module *const mod)
 {
@@ -1233,6 +1220,22 @@ static inline void wctdm_transmitprep(struct wctdm *wc, unsigned char *sframe)
 	spin_unlock(&wc->reglock);
 }
 
+/* Must be called with wc.reglock held and local interrupts disabled */
+static inline void
+wctdm_setreg_intr(struct wctdm *wc, struct wctdm_module *mod, int addr, int val)
+{
+	struct wctdm_cmd *cmd;
+
+	cmd = kmalloc(sizeof(*cmd), GFP_ATOMIC);
+	if (unlikely(!cmd))
+		return;
+
+	cmd->complete = NULL;
+	cmd->cmd = CMD_WR(addr, val);
+
+	list_add_tail(&cmd->node, &mod->pending_cmds);
+}
+
 int wctdm_setreg(struct wctdm *wc, struct wctdm_module *mod, int addr, int val)
 {
 	struct wctdm_cmd *cmd;

drivers/dahdi/xpp/xpp_dahdi.c

@@ -834,7 +834,7 @@ int xpp_maint(struct dahdi_span *span, int cmd)
  * If the watchdog detects no received data, it will call the
  * watchdog routine
  */
-int xpp_watchdog(struct dahdi_span *span, int cause)
+static int xpp_watchdog(struct dahdi_span *span, int cause)
 {
 	static	int rate_limit = 0;
 
@@ -842,7 +842,6 @@ int xpp_watchdog(struct dahdi_span *span, int cause)
 		DBG(GENERAL, "\n");
 	return 0;
 }
-EXPORT_SYMBOL(xpp_watchdog);
 #endif
 
 /*

drivers/dahdi/xpp/xpp_dahdi.h

@@ -47,7 +47,6 @@ int xpp_close(struct dahdi_chan *chan);
 int xpp_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long arg);
 int xpp_hooksig(struct dahdi_chan *chan, enum dahdi_txsig txsig);
 int xpp_maint(struct dahdi_span *span, int cmd);
-int xpp_watchdog(struct dahdi_span *span, int cause);
 void xpp_span_assigned(struct dahdi_span *span);
 void report_bad_ioctl(const char *msg, xpd_t *xpd, int pos, unsigned int cmd);
 int total_registered_spans(void);

include/dahdi/kernel.h

@@ -1280,13 +1280,8 @@ extern u_char __dahdi_lin2mu[16384];
 extern u_char __dahdi_lin2a[16384];
 #endif
 
-struct dahdi_dynamic_ops {
-	struct module *owner;
-	int (*ioctl)(unsigned int cmd, unsigned long data);
-};
-
 /*! \brief Used by dynamic DAHDI -- don't use directly */
-void dahdi_set_dynamic_ops(const struct dahdi_dynamic_ops *ops);
+void dahdi_set_dynamic_ioctl(int (*func)(unsigned int cmd, unsigned long data));
 
 /*! \brief Used by DAHDI HPEC module -- don't use directly */
 void dahdi_set_hpec_ioctl(int (*func)(unsigned int cmd, unsigned long data));