[svn-commits] sruffell: branch linux/sruffell/wctdm24xxp-cmdlist r9842 - in /linux/team/sru...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Mar 16 16:39:23 CDT 2011
Author: sruffell
Date: Wed Mar 16 16:39:19 2011
New Revision: 9842
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9842
Log:
wctdm24xxp, wcte12xp, wct4xxp, wcb4xxp, wctdm: Do not support suspend
These drivers (all DAHDI drivers) should explicitly block suspend.
Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Modified:
linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wcb4xxp/base.c
linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wct4xxp/base.c
linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctc4xxp/base.c
linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctdm.c
linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctdm24xxp/base.c
linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wcte12xp/base.c
linux/team/sruffell/wctdm24xxp-cmdlist/include/dahdi/kernel.h
Modified: linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=9842&r1=9841&r2=9842
==============================================================================
--- linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wcb4xxp/base.c Wed Mar 16 16:39:19 2011
@@ -3065,11 +3065,17 @@
};
+static int b4xx_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+ return -ENOSYS;
+}
+
static struct pci_driver b4xx_driver = {
.name = "wcb4xxp",
.probe = b4xx_probe,
.remove = __devexit_p(b4xxp_remove),
.id_table = b4xx_ids,
+ .suspend = b4xx_suspend,
};
static int __init b4xx_init(void)
Modified: linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wct4xxp/base.c?view=diff&rev=9842&r1=9841&r2=9842
==============================================================================
--- linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wct4xxp/base.c Wed Mar 16 16:39:19 2011
@@ -4979,6 +4979,11 @@
}
#endif
+static int t4_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+ return -ENOSYS;
+}
+
static struct pci_driver t4_driver = {
.name = "wct4xxp",
.probe = t4_init_one,
@@ -4986,6 +4991,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
.shutdown = _t4_shutdown,
#endif
+ .suspend = t4_suspend,
.id_table = t4_pci_tbl,
};
Modified: linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctc4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=9842&r1=9841&r2=9842
==============================================================================
--- linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctc4xxp/base.c Wed Mar 16 16:39:19 2011
@@ -3721,11 +3721,17 @@
MODULE_DEVICE_TABLE(pci, wctc4xxp_pci_tbl);
+static int wctc4xxp_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+ return -ENOSYS;
+}
+
static struct pci_driver wctc4xxp_driver = {
.name = "wctc4xxp",
.probe = wctc4xxp_init_one,
.remove = __devexit_p(wctc4xxp_remove_one),
.id_table = wctc4xxp_pci_tbl,
+ .suspend = wctc4xxp_suspend,
};
static int __init wctc4xxp_init(void)
Modified: linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctdm.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctdm.c?view=diff&rev=9842&r1=9841&r2=9842
==============================================================================
--- linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctdm.c (original)
+++ linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctdm.c Wed Mar 16 16:39:19 2011
@@ -2765,12 +2765,16 @@
MODULE_DEVICE_TABLE(pci, wctdm_pci_tbl);
+static int wctdm_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+ return -ENOSYS;
+}
+
static struct pci_driver wctdm_driver = {
.name = "wctdm",
.probe = wctdm_init_one,
.remove =__devexit_p(wctdm_remove_one),
- .suspend = NULL,
- .resume = NULL,
+ .suspend = wctdm_suspend,
.id_table = wctdm_pci_tbl,
};
Modified: linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=9842&r1=9841&r2=9842
==============================================================================
--- linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wctdm24xxp/base.c Wed Mar 16 16:39:19 2011
@@ -4902,6 +4902,11 @@
MODULE_DEVICE_TABLE(pci, wctdm_pci_tbl);
+static int wctdm_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+ return -ENOSYS;
+}
+
static struct pci_driver wctdm_driver = {
.name = "wctdm24xxp",
.probe = wctdm_init_one,
@@ -4909,6 +4914,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
.shutdown = wctdm_shutdown,
#endif
+ .suspend = wctdm_suspend,
.id_table = wctdm_pci_tbl,
};
Modified: linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wcte12xp/base.c?view=diff&rev=9842&r1=9841&r2=9842
==============================================================================
--- linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/team/sruffell/wctdm24xxp-cmdlist/drivers/dahdi/wcte12xp/base.c Wed Mar 16 16:39:19 2011
@@ -2377,6 +2377,11 @@
}
#endif
+static int te12xp_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+ return -ENOSYS;
+}
+
MODULE_DEVICE_TABLE(pci, te12xp_pci_tbl);
static struct pci_driver te12xp_driver = {
@@ -2386,6 +2391,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 12)
.shutdown = te12xp_shutdown,
#endif
+ .suspend = te12xp_suspend,
.id_table = te12xp_pci_tbl,
};
Modified: linux/team/sruffell/wctdm24xxp-cmdlist/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/wctdm24xxp-cmdlist/include/dahdi/kernel.h?view=diff&rev=9842&r1=9841&r2=9842
==============================================================================
--- linux/team/sruffell/wctdm24xxp-cmdlist/include/dahdi/kernel.h (original)
+++ linux/team/sruffell/wctdm24xxp-cmdlist/include/dahdi/kernel.h Wed Mar 16 16:39:19 2011
@@ -1312,7 +1312,7 @@
return timeout;
}
#endif
-
+typedef u32 __bitwise pm_message_t;
#endif /* 2.6.11 */
#endif /* 2.6.12 */
#endif /* 2.6.14 */
More information about the svn-commits
mailing list