FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi_dynamic: "dahdi_dynamic_[un]register()" -> "dahdi_dynamic_[un]register_driver()"

Browse Source 
Clarify that we're registering / unregistering the driver.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9572 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell
2011-01-03 18:25:27 +00:00
parent 53fef32a61
commit 1aacc92326
5 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/dahdi/dahdi_dynamic.c
View File

@@ -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;

4
drivers/dahdi/dahdi_dynamic_eth.c
View File

@@ -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");

4
drivers/dahdi/dahdi_dynamic_ethmf.c
View File

@@ -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)

4
drivers/dahdi/dahdi_dynamic_loc.c
View File

@@ -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);

4
include/dahdi/kernel.h
View File

@@ -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 */