From 8f4a6260871b02f2906a68b1cb1f133e0b20b1ae Mon Sep 17 00:00:00 2001 From: Oron Peled Date: Wed, 26 Oct 2011 19:07:21 +0000 Subject: [PATCH] xpp: Remove dahdi_autoreg parameter: * With pinned-spans all spans are registered to dahdi with the device (and assigned later) * So this parameter cannot function anymore * Also remove the (now) empty xpd_post_init() function. Signed-off-by: Oron Peled git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10284 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/xpp/xbus-core.c | 1 - drivers/dahdi/xpp/xpp_dahdi.c | 9 --------- drivers/dahdi/xpp/xpp_dahdi.h | 1 - 3 files changed, 11 deletions(-) diff --git a/drivers/dahdi/xpp/xbus-core.c b/drivers/dahdi/xpp/xbus-core.c index b2f7616..860a950 100644 --- a/drivers/dahdi/xpp/xbus-core.c +++ b/drivers/dahdi/xpp/xbus-core.c @@ -776,7 +776,6 @@ static int xpd_initialize(xpd_t *xpd) goto out; } XPD_INFO(xpd, "Initialized: %s\n", xpd->type_name); - xpd_post_init(xpd); ret = 0; out: return ret; diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index 1c61c49..96e9fde 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -57,7 +57,6 @@ struct proc_dir_entry *xpp_proc_toplevel = NULL; #define DELAY_UNTIL_DIALTONE 3000 DEF_PARM(int, debug, 0, 0644, "Print DBG statements"); -static DEF_PARM_BOOL(dahdi_autoreg, 0, 0644, "Register spans automatically (1) or not (0)"); static DEF_PARM_BOOL(prefmaster, 0, 0644, "Do we want to be dahdi preferred sync master"); // DEF_ARRAY(int, pcmtx, 4, 0, "Forced PCM values to transmit"); @@ -253,13 +252,6 @@ int create_xpd(xbus_t *xbus, const xproto_table_t *proto_table, return 0; } -void xpd_post_init(xpd_t *xpd) -{ - XPD_DBG(DEVICES, xpd, "\n"); - /* DEBUG if(dahdi_autoreg) */ - /* DEBUG dahdi_register_xpd(xpd); */ -} - #ifdef CONFIG_PROC_FS /** @@ -1166,7 +1158,6 @@ static void __exit xpp_dahdi_cleanup(void) EXPORT_SYMBOL(debug); EXPORT_SYMBOL(create_xpd); -EXPORT_SYMBOL(xpd_post_init); EXPORT_SYMBOL(get_xpd); EXPORT_SYMBOL(put_xpd); EXPORT_SYMBOL(xpd_alloc); diff --git a/drivers/dahdi/xpp/xpp_dahdi.h b/drivers/dahdi/xpp/xpp_dahdi.h index 8a6dd47..cd9afb6 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.h +++ b/drivers/dahdi/xpp/xpp_dahdi.h @@ -32,7 +32,6 @@ void xpd_dahdi_preunregister(xpd_t *xpd); void xpd_dahdi_postunregister(xpd_t *xpd); int create_xpd(xbus_t *xbus, const xproto_table_t *proto_table, int unit, int subunit, byte type, byte subtype, int subunits, int subunit_ports, byte port_dir); -void xpd_post_init(xpd_t *xpd); xpd_t *xpd_alloc(xbus_t *xbus, int unit, int subunit, int subtype, int subunits, size_t privsize, const xproto_table_t *proto_table, int channels); void xpd_free(xpd_t *xpd); void xpd_remove(xpd_t *xpd);