[svn-commits] kmoore: linux/trunk r9523 - in /linux/trunk: drivers/dahdi/ drivers/dahdi/wcb...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Dec 9 14:19:24 CST 2010
Author: kmoore
Date: Thu Dec 9 14:19:21 2010
New Revision: 9523
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9523
Log:
dahdi-base, kernel, dahdi_echocan_*, wcb4xxp, wct4xxp, wctdm24xxp, wcte12xp: Remove name field from echocan ops
This field was redundant and was only used in places where the factory's name could be used.
Signed-off-by: Kinsey Moore <kmoore at digium.com>
Acked-by: Shaun Ruffell <sruffell at digium.com>
Modified:
linux/trunk/drivers/dahdi/dahdi-base.c
linux/trunk/drivers/dahdi/dahdi_echocan_jpah.c
linux/trunk/drivers/dahdi/dahdi_echocan_kb1.c
linux/trunk/drivers/dahdi/dahdi_echocan_mg2.c
linux/trunk/drivers/dahdi/dahdi_echocan_oslec.c
linux/trunk/drivers/dahdi/dahdi_echocan_sec.c
linux/trunk/drivers/dahdi/dahdi_echocan_sec2.c
linux/trunk/drivers/dahdi/wcb4xxp/base.c
linux/trunk/drivers/dahdi/wct4xxp/base.c
linux/trunk/drivers/dahdi/wctdm24xxp/base.c
linux/trunk/drivers/dahdi/wcte12xp/base.c
linux/trunk/include/dahdi/kernel.h
Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Thu Dec 9 14:19:21 2010
@@ -798,12 +798,9 @@
chan->chan_alarms);
if (chan->ec_factory)
- len += snprintf(page+len, count-len, "(ECTYPE: %s) ",
- chan->ec_factory->name);
-
- if (chan->ec_state)
- len += snprintf(page+len, count-len, "(EC: %s) ",
- chan->ec_state->ops->name);
+ len += snprintf(page+len, count-len, "(EC: %s - %s) ",
+ chan->ec_factory->name,
+ chan->ec_state ? "ACTIVE" : "INACTIVE");
len += snprintf(page+len, count-len, "\n");
Modified: linux/trunk/drivers/dahdi/dahdi_echocan_jpah.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_echocan_jpah.c?view=diff&rev=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_echocan_jpah.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_echocan_jpah.c Thu Dec 9 14:19:21 2010
@@ -54,7 +54,6 @@
};
static const struct dahdi_echocan_ops my_ops = {
- .name = "JPAH",
.echocan_free = echo_can_free,
.echocan_process = echo_can_process,
.echocan_traintap = echo_can_traintap,
Modified: linux/trunk/drivers/dahdi/dahdi_echocan_kb1.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_echocan_kb1.c?view=diff&rev=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_echocan_kb1.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_echocan_kb1.c Thu Dec 9 14:19:21 2010
@@ -160,7 +160,6 @@
};
static const struct dahdi_echocan_ops my_ops = {
- .name = "KB1",
.echocan_free = echo_can_free,
.echocan_process = echo_can_process,
.echocan_traintap = echo_can_traintap,
Modified: linux/trunk/drivers/dahdi/dahdi_echocan_mg2.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_echocan_mg2.c?view=diff&rev=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_echocan_mg2.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_echocan_mg2.c Thu Dec 9 14:19:21 2010
@@ -192,7 +192,6 @@
};
static const struct dahdi_echocan_ops my_ops = {
- .name = "MG2",
.echocan_free = echo_can_free,
.echocan_process = echo_can_process,
.echocan_traintap = echo_can_traintap,
Modified: linux/trunk/drivers/dahdi/dahdi_echocan_oslec.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_echocan_oslec.c?view=diff&rev=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_echocan_oslec.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_echocan_oslec.c Thu Dec 9 14:19:21 2010
@@ -55,7 +55,6 @@
};
static const struct dahdi_echocan_ops my_ops = {
- .name = "OSLEC",
.echocan_free = echo_can_free,
.echocan_process = echo_can_process,
.echocan_traintap = echo_can_traintap,
Modified: linux/trunk/drivers/dahdi/dahdi_echocan_sec.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_echocan_sec.c?view=diff&rev=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_echocan_sec.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_echocan_sec.c Thu Dec 9 14:19:21 2010
@@ -98,7 +98,6 @@
};
static const struct dahdi_echocan_ops my_ops = {
- .name = "SEC",
.echocan_free = echo_can_free,
.echocan_process = echo_can_process,
.echocan_traintap = echo_can_traintap,
Modified: linux/trunk/drivers/dahdi/dahdi_echocan_sec2.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_echocan_sec2.c?view=diff&rev=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_echocan_sec2.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_echocan_sec2.c Thu Dec 9 14:19:21 2010
@@ -89,7 +89,6 @@
};
static const struct dahdi_echocan_ops my_ops = {
- .name = "SEC2",
.echocan_free = echo_can_free,
.echocan_process = echo_can_process,
.echocan_traintap = echo_can_traintap,
Modified: linux/trunk/drivers/dahdi/wcb4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcb4xxp/base.c?view=diff&rev=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/wcb4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcb4xxp/base.c Thu Dec 9 14:19:21 2010
@@ -152,7 +152,6 @@
};
static const struct dahdi_echocan_ops my_ec_ops = {
- .name = "HWEC",
.echocan_free = echocan_free,
};
Modified: linux/trunk/drivers/dahdi/wct4xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wct4xxp/base.c?view=diff&rev=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/wct4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wct4xxp/base.c Thu Dec 9 14:19:21 2010
@@ -406,12 +406,10 @@
};
static const struct dahdi_echocan_ops vpm400m_ec_ops = {
- .name = "VPM400M",
.echocan_free = echocan_free,
};
static const struct dahdi_echocan_ops vpm450m_ec_ops = {
- .name = "VPM450M",
.echocan_free = echocan_free,
};
#endif
@@ -1308,7 +1306,8 @@
if (ecp->param_count > 0) {
dev_warn(&wc->dev->dev, "%s echo canceller does not support "
- "parameters; failing request\n", ops->name);
+ "parameters; failing request\n",
+ chan->ec_factory->name);
return -EINVAL;
}
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=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Thu Dec 9 14:19:21 2010
@@ -268,12 +268,10 @@
};
static const struct dahdi_echocan_ops vpm100m_ec_ops = {
- .name = "VPM100M",
.echocan_free = echocan_free,
};
static const struct dahdi_echocan_ops vpm150m_ec_ops = {
- .name = "VPM150M",
.echocan_free = echocan_free,
};
@@ -1991,7 +1989,9 @@
}
if (wc->vpm100 && (ecp->param_count > 0)) {
- dev_warn(&wc->vb.pdev->dev, "%s echo canceller does not support parameters; failing request\n", ops->name);
+ dev_warn(&wc->vb.pdev->dev, "%s echo canceller does not "
+ "support parameters; failing request\n",
+ chan->ec_factory->name);
return -EINVAL;
}
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=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Thu Dec 9 14:19:21 2010
@@ -82,7 +82,6 @@
};
static const struct dahdi_echocan_ops vpm150m_ec_ops = {
- .name = "VPM150M",
.echocan_free = echocan_free,
};
Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=9523&r1=9522&r2=9523
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Thu Dec 9 14:19:21 2010
@@ -204,9 +204,6 @@
* with a pointer to the relevant operations structure for that instance.
*/
struct dahdi_echocan_ops {
-
- /*! The name of the echocan that created this structure. */
- const char *name;
/*! \brief Free an echocan state structure.
* \param[in,out] ec Pointer to the state structure to free.
More information about the svn-commits
mailing list