[svn-commits] sruffell: linux/trunk r8979 - in /linux/trunk/drivers/dahdi: voicebus/ wctdm2...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Sun Jul 25 19:30:36 2010
New Revision: 8979

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8979
Log:
wcte12xp, wctdm24xxp: Add shutdown handlers.

Make the drivers a little more kexec friendly.

Modified:
    linux/trunk/drivers/dahdi/voicebus/voicebus.c
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c

Modified: linux/trunk/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=8979&r1=8978&r2=8979
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/voicebus.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/voicebus.c Sun Jul 25 19:30:36 2010
@@ -996,6 +996,7 @@
 #if defined(CONFIG_VOICEBUS_TIMER)
 	del_timer_sync(&vb->timer);
 #endif
+	vb_disable_interrupts(vb);
 	up(&stop);
 }
 EXPORT_SYMBOL(voicebus_stop);

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=8979&r1=8978&r2=8979
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Sun Jul 25 19:30:36 2010
@@ -4983,12 +4983,23 @@
 	{ 0 }
 };
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
+static void wctdm_shutdown(struct pci_dev *pdev)
+{
+	struct wctdm *wc = pci_get_drvdata(pdev);
+	voicebus_stop(&wc->vb);
+}
+#endif
+
 MODULE_DEVICE_TABLE(pci, wctdm_pci_tbl);
 
 static struct pci_driver wctdm_driver = {
 	.name = "wctdm24xxp",
 	.probe = wctdm_init_one,
 	.remove = __devexit_p(wctdm_remove_one),
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
+	.shutdown = wctdm_shutdown,
+#endif
 	.id_table = wctdm_pci_tbl,
 };
 

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=8979&r1=8978&r2=8979
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Sun Jul 25 19:30:36 2010
@@ -2314,12 +2314,23 @@
 	{ 0 }
 };
 
+#if LINUX_KERNEL_VERSION >= KERNEL_VERSION(2, 6, 12)
+static void te12xp_shutdown(struct pci_dev *pdev)
+{
+	struct t1 *wc = pci_get_drvdata(pdev);
+	voicebus_stop(&wc->vb);
+}
+#endif
+
 MODULE_DEVICE_TABLE(pci, te12xp_pci_tbl);
 
 static struct pci_driver te12xp_driver = {
 	.name = "wcte12xp",
 	.probe = te12xp_init_one,
 	.remove = __devexit_p(te12xp_remove_one),
+#if LINUX_KERNEL_VERSION >= KERNEL_VERSION(2, 6, 12)
+	.shutdown = te12xp_shutdown,
+#endif
 	.id_table = te12xp_pci_tbl,
 };