diff options
-rw-r--r-- | drivers/dahdi/dahdi_dynamic.c | 11 | ||||
-rw-r--r-- | drivers/dahdi/dahdi_dynamic_eth.c | 4 | ||||
-rw-r--r-- | drivers/dahdi/dahdi_dynamic_ethmf.c | 4 | ||||
-rw-r--r-- | drivers/dahdi/dahdi_dynamic_loc.c | 4 | ||||
-rw-r--r-- | include/dahdi/kernel.h | 4 |
5 files changed, 13 insertions, 14 deletions
diff --git a/drivers/dahdi/dahdi_dynamic.c b/drivers/dahdi/dahdi_dynamic.c index 4b4abb3..60c7153 100644 --- a/drivers/dahdi/dahdi_dynamic.c +++ b/drivers/dahdi/dahdi_dynamic.c @@ -75,10 +75,6 @@ #define ERR_NCHAN (1 << 17) #define ERR_LEN (1 << 18) -EXPORT_SYMBOL(dahdi_dynamic_register); -EXPORT_SYMBOL(dahdi_dynamic_unregister); -EXPORT_SYMBOL(dahdi_dynamic_receive); - static int dahdi_dynamic_init(void); static void dahdi_dynamic_cleanup(void); @@ -395,6 +391,7 @@ void dahdi_dynamic_receive(struct dahdi_span *span, unsigned char *msg, int msgl if (master) dahdi_dynamic_run(); } +EXPORT_SYMBOL(dahdi_dynamic_receive); /** * dahdi_dynamic_release() - Free the memory associated with the dahdi_dynamic. @@ -717,7 +714,7 @@ static int dahdi_dynamic_ioctl(unsigned int cmd, unsigned long data) return -ENOTTY; } -int dahdi_dynamic_register(struct dahdi_dynamic_driver *dri) +int dahdi_dynamic_register_driver(struct dahdi_dynamic_driver *dri) { unsigned long flags; int res = 0; @@ -731,8 +728,9 @@ int dahdi_dynamic_register(struct dahdi_dynamic_driver *dri) } return res; } +EXPORT_SYMBOL(dahdi_dynamic_register_driver); -void dahdi_dynamic_unregister(struct dahdi_dynamic_driver *dri) +void dahdi_dynamic_unregister_driver(struct dahdi_dynamic_driver *dri) { struct dahdi_dynamic *d; unsigned long flags; @@ -752,6 +750,7 @@ void dahdi_dynamic_unregister(struct dahdi_dynamic_driver *dri) } } } +EXPORT_SYMBOL(dahdi_dynamic_unregister_driver); static struct timer_list alarmcheck; diff --git a/drivers/dahdi/dahdi_dynamic_eth.c b/drivers/dahdi/dahdi_dynamic_eth.c index c28bf20..bc4af21 100644 --- a/drivers/dahdi/dahdi_dynamic_eth.c +++ b/drivers/dahdi/dahdi_dynamic_eth.c @@ -413,7 +413,7 @@ static int __init ztdeth_init(void) { dev_add_pack(&ztdeth_ptype); register_netdevice_notifier(&ztdeth_nblock); - dahdi_dynamic_register(&ztd_eth); + dahdi_dynamic_register_driver(&ztd_eth); skb_queue_head_init(&skbs); @@ -424,7 +424,7 @@ static void __exit ztdeth_exit(void) { dev_remove_pack(&ztdeth_ptype); unregister_netdevice_notifier(&ztdeth_nblock); - dahdi_dynamic_unregister(&ztd_eth); + dahdi_dynamic_unregister_driver(&ztd_eth); } MODULE_DESCRIPTION("DAHDI Dynamic TDMoE Support"); diff --git a/drivers/dahdi/dahdi_dynamic_ethmf.c b/drivers/dahdi/dahdi_dynamic_ethmf.c index 8dfb464..7a435d4 100644 --- a/drivers/dahdi/dahdi_dynamic_ethmf.c +++ b/drivers/dahdi/dahdi_dynamic_ethmf.c @@ -800,7 +800,7 @@ static int __init ztdethmf_init(void) dev_add_pack(&ztdethmf_ptype); register_netdevice_notifier(&ztdethmf_nblock); - dahdi_dynamic_register(&ztd_ethmf); + dahdi_dynamic_register_driver(&ztd_ethmf); skb_queue_head_init(&skbs); @@ -822,7 +822,7 @@ static void __exit ztdethmf_exit(void) dev_remove_pack(&ztdethmf_ptype); unregister_netdevice_notifier(&ztdethmf_nblock); - dahdi_dynamic_unregister(&ztd_ethmf); + dahdi_dynamic_unregister_driver(&ztd_ethmf); #ifdef USE_PROC_FS if (proc_entry) diff --git a/drivers/dahdi/dahdi_dynamic_loc.c b/drivers/dahdi/dahdi_dynamic_loc.c index 3240311..72c8162 100644 --- a/drivers/dahdi/dahdi_dynamic_loc.c +++ b/drivers/dahdi/dahdi_dynamic_loc.c @@ -250,13 +250,13 @@ static struct dahdi_dynamic_driver dahdi_dynamic_local = { static int __init dahdi_dynamic_local_init(void) { - dahdi_dynamic_register(&dahdi_dynamic_local); + dahdi_dynamic_register_driver(&dahdi_dynamic_local); return 0; } static void __exit dahdi_dynamic_local_exit(void) { - dahdi_dynamic_unregister(&dahdi_dynamic_local); + dahdi_dynamic_unregister_driver(&dahdi_dynamic_local); } module_init(dahdi_dynamic_local_init); diff --git a/include/dahdi/kernel.h b/include/dahdi/kernel.h index 26bce0b..863ad04 100644 --- a/include/dahdi/kernel.h +++ b/include/dahdi/kernel.h @@ -1012,10 +1012,10 @@ struct dahdi_dynamic_driver { void dahdi_dynamic_receive(struct dahdi_span *span, unsigned char *msg, int msglen); /*! \brief Register a dynamic driver */ -int dahdi_dynamic_register(struct dahdi_dynamic_driver *driver); +int dahdi_dynamic_register_driver(struct dahdi_dynamic_driver *driver); /*! \brief Unregister a dynamic driver */ -void dahdi_dynamic_unregister(struct dahdi_dynamic_driver *driver); +void dahdi_dynamic_unregister_driver(struct dahdi_dynamic_driver *driver); /*! Receive on a span. The DAHDI interface will handle all the calculations for all member channels of the span, pulling the data from the readchunk buffer */ |