[svn-commits] kmoore: linux/trunk r9526 - /linux/trunk/drivers/dahdi/hpec/dahdi_echocan_hpec.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Thu Dec  9 15:52:34 2010
New Revision: 9526

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9526
Log:
dahdi_echocan_hpec: Update the HPEC wrapper to use the new name interface

I apparently forgot all about HPEC when updating the echocans for the change
in the factory and echocan ops structures related to echocan naming.  The HPEC
wrapper should now be up to date with the rest of DAHDI.

Signed-off-by: Kinsey Moore <kmoore at digium.com>

Modified:
    linux/trunk/drivers/dahdi/hpec/dahdi_echocan_hpec.c

Modified: linux/trunk/drivers/dahdi/hpec/dahdi_echocan_hpec.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/hpec/dahdi_echocan_hpec.c?view=diff&rev=9526&r1=9525&r2=9526
==============================================================================
--- linux/trunk/drivers/dahdi/hpec/dahdi_echocan_hpec.c (original)
+++ linux/trunk/drivers/dahdi/hpec/dahdi_echocan_hpec.c Thu Dec  9 15:52:34 2010
@@ -42,9 +42,11 @@
 static void echo_can_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec);
 static void echo_can_process(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size);
 static int echo_can_traintap(struct dahdi_echocan_state *ec, int pos, short val);
+static const char *name = "HPEC";
+static const char *ec_name(const struct dahdi_chan *chan) { return name; }
 
 static const struct dahdi_echocan_factory my_factory = {
-	.name = "HPEC",
+	.get_name = ec_name,
 	.owner = THIS_MODULE,
 	.echocan_create = echo_can_create,
 };
@@ -56,7 +58,6 @@
 };
 
 static const struct dahdi_echocan_ops my_ops = {
-	.name = "HPEC",
 	.echocan_free = echo_can_free,
 	.echocan_process = echo_can_process,
 	.echocan_traintap = echo_can_traintap,
@@ -195,7 +196,8 @@
 		return -EPERM;
 	}
 
-	module_printk(KERN_NOTICE, "Registered echo canceler '%s'\n", my_factory.name);
+	module_printk(KERN_NOTICE, "Registered echo canceler '%s'\n",
+		my_factory.get_name(NULL));
 
 	hpec_init(logger, debug, DAHDI_CHUNKSIZE, memalloc, memfree);