summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2010-02-08 22:49:31 +0000
committerShaun Ruffell <sruffell@digium.com>2010-02-08 22:49:31 +0000
commit791a3df5afe66a8cbe15ebe030c2956fd2e00818 (patch)
tree9d8bacb1cb7a32283d7795607522d312cd0330a6
parentaeee4d888dc689a885187d77488d6754ae853dce (diff)
voicebus: Remove unused 'voicebus_get_pci_dev'.
Function is no longer needed since the 'struct voicebus' is now embedded in the client contexts. This commit also contains a few trivial formatting changes for sparse's sake. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@8002 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/voicebus/GpakCust.c4
-rw-r--r--drivers/dahdi/voicebus/voicebus.c15
2 files changed, 5 insertions, 14 deletions
diff --git a/drivers/dahdi/voicebus/GpakCust.c b/drivers/dahdi/voicebus/GpakCust.c
index bcf8bc7..9491818 100644
--- a/drivers/dahdi/voicebus/GpakCust.c
+++ b/drivers/dahdi/voicebus/GpakCust.c
@@ -129,7 +129,7 @@ static struct vpmadt032_cmd *vpmadt032_getreg_full_async(struct vpmadt032 *vpm,
}
/* Get the results from a previous call to vpmadt032_getreg_full_async. */
-int vpmadt032_getreg_full_return(struct vpmadt032 *vpm, int pagechange,
+static int vpmadt032_getreg_full_return(struct vpmadt032 *vpm, int pagechange,
u16 addr, u16 *outbuf, struct vpmadt032_cmd *cmd)
{
unsigned long flags;
@@ -742,7 +742,7 @@ void gpakReadDspMemory(
vpmadt032_io_wait(vpm);
if ( NumWords < VPM150M_MAX_COMMANDS ) {
- struct vpmadt032_cmd *cmds[VPM150M_MAX_COMMANDS] = {0};
+ struct vpmadt032_cmd *cmds[VPM150M_MAX_COMMANDS] = {NULL};
vpmadt032_setpage(vpm, DspAddress >> 16);
DspAddress &= 0xffff;
for (i=0; i < NumWords; ++i) {
diff --git a/drivers/dahdi/voicebus/voicebus.c b/drivers/dahdi/voicebus/voicebus.c
index edd4039..ffbe971 100644
--- a/drivers/dahdi/voicebus/voicebus.c
+++ b/drivers/dahdi/voicebus/voicebus.c
@@ -1650,15 +1650,6 @@ cleanup:
}
EXPORT_SYMBOL(voicebus_init);
-
-/*! \brief Return the pci_dev in use by this voicebus interface. */
-struct pci_dev *
-voicebus_get_pci_dev(struct voicebus *vb)
-{
- return vb->pdev;
-}
-EXPORT_SYMBOL(voicebus_get_pci_dev);
-
static spinlock_t loader_list_lock;
static struct list_head binary_loader_list;
@@ -1734,7 +1725,7 @@ int vpmadtreg_unregister(struct vpmadt_loader *loader)
}
EXPORT_SYMBOL(vpmadtreg_unregister);
-int __init voicebus_module_init(void)
+static int __init voicebus_module_init(void)
{
int res;
@@ -1772,7 +1763,7 @@ int __init voicebus_module_init(void)
* defined, but it will make sure that this module is a dependency of
* dahdi.ko, so that when it is being unloded, this module will be
* unloaded as well. */
- dahdi_register(0, 0);
+ dahdi_register(NULL, 0);
INIT_LIST_HEAD(&binary_loader_list);
spin_lock_init(&loader_list_lock);
res = vpmadt032_module_init();
@@ -1781,7 +1772,7 @@ int __init voicebus_module_init(void)
return 0;
}
-void __exit voicebus_module_cleanup(void)
+static void __exit voicebus_module_cleanup(void)
{
kmem_cache_destroy(buffer_cache);
WARN_ON(!list_empty(&binary_loader_list));