[svn-commits] sruffell: linux/trunk r8002 - /linux/trunk/drivers/dahdi/voicebus/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Feb  8 16:49:31 2010
New Revision: 8002

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8002
Log:
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.

Modified:
    linux/trunk/drivers/dahdi/voicebus/GpakCust.c
    linux/trunk/drivers/dahdi/voicebus/voicebus.c

Modified: linux/trunk/drivers/dahdi/voicebus/GpakCust.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/GpakCust.c?view=diff&rev=8002&r1=8001&r2=8002
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/GpakCust.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/GpakCust.c Mon Feb  8 16:49:31 2010
@@ -129,7 +129,7 @@
 }
 
 /* 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 @@
 
 	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) {

Modified: linux/trunk/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=8002&r1=8001&r2=8002
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/voicebus.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/voicebus.c Mon Feb  8 16:49:31 2010
@@ -1650,15 +1650,6 @@
 }
 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 @@
 }
 EXPORT_SYMBOL(vpmadtreg_unregister);
 
-int __init voicebus_module_init(void)
+static int __init voicebus_module_init(void)
 {
 	int res;
 
@@ -1772,7 +1763,7 @@
 	 * 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 @@
 	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));