[svn-commits] sruffell: linux/trunk r8005 - in /linux/trunk/drivers/dahdi: wctdm24xxp/ wcte...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Feb  8 16:49:33 2010
New Revision: 8005

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=8005
Log:
wcte12xp, wctdm24xxp: Declare static symbols that aren't externally referenced.

Modified:
    linux/trunk/drivers/dahdi/wctdm24xxp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/base.c
    linux/trunk/drivers/dahdi/wcte12xp/wcte12xp.h

Modified: linux/trunk/drivers/dahdi/wctdm24xxp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wctdm24xxp/base.c?view=diff&rev=8005&r1=8004&r2=8005
==============================================================================
--- linux/trunk/drivers/dahdi/wctdm24xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctdm24xxp/base.c Mon Feb  8 16:49:33 2010
@@ -288,7 +288,9 @@
 	return -1;
 }
 
-void setchanconfig_from_state(struct vpmadt032 *vpm, int channel, GpakChannelConfig_t *chanconfig)
+static void
+setchanconfig_from_state(struct vpmadt032 *vpm, int channel,
+			 GpakChannelConfig_t *chanconfig)
 {
 	const struct vpmadt032_options *options;
 	GpakEcanParms_t *p;
@@ -3724,8 +3726,8 @@
 	return sprintf(buf, "%d\n", current_latency);
 }
 
-DEVICE_ATTR(voicebus_current_latency, 0400,
-	    voicebus_current_latency_show, NULL);
+static DEVICE_ATTR(voicebus_current_latency, 0400,
+		   voicebus_current_latency_show, NULL);
 #endif
 
 

Modified: linux/trunk/drivers/dahdi/wcte12xp/base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/base.c?view=diff&rev=8005&r1=8004&r2=8005
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/base.c Mon Feb  8 16:49:33 2010
@@ -53,9 +53,7 @@
 #error VOICEBUS_SFRAME_SIZE != SFRAME_SIZE
 #endif
 
-struct pci_driver te12xp_driver;
-
-int debug = 0;
+static int debug;
 static int j1mode = 0;
 static int alarmdebounce = 2500; /* LOF/LFA def to 2.5s AT&T TR54016*/
 static int losalarmdebounce = 2500; /* LOS def to 2.5s AT&T TR54016*/
@@ -65,12 +63,12 @@
 static int t1e1override = -1;
 static int unchannelized = 0;
 static int latency = VOICEBUS_DEFAULT_LATENCY;
-int vpmsupport = 1;
+static int vpmsupport = 1;
 static int vpmtsisupport = 0;
 
-int vpmnlptype = DEFAULT_NLPTYPE;
-int vpmnlpthresh = DEFAULT_NLPTHRESH;
-int vpmnlpmaxsupp = DEFAULT_NLPMAXSUPP;
+static int vpmnlptype = DEFAULT_NLPTYPE;
+static int vpmnlpthresh = DEFAULT_NLPTHRESH;
+static int vpmnlpmaxsupp = DEFAULT_NLPMAXSUPP;
 
 static int echocan_create(struct dahdi_chan *chan, struct dahdi_echocanparams *ecp,
 			   struct dahdi_echocanparam *p, struct dahdi_echocan_state **ec);
@@ -87,7 +85,7 @@
 	.echocan_free = echocan_free,
 };
 
-struct t1 *ifaces[WC_MAX_IFACES];
+static struct t1 *ifaces[WC_MAX_IFACES];
 spinlock_t ifacelock = SPIN_LOCK_UNLOCKED;
 
 struct t1_desc {
@@ -1893,7 +1891,7 @@
 
 MODULE_DEVICE_TABLE(pci, te12xp_pci_tbl);
 
-struct pci_driver te12xp_driver = {
+static struct pci_driver te12xp_driver = {
 	.name = "wcte12xp",
 	.probe = te12xp_init_one,
 	.remove = __devexit_p(te12xp_remove_one),

Modified: linux/trunk/drivers/dahdi/wcte12xp/wcte12xp.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/wcte12xp/wcte12xp.h?view=diff&rev=8005&r1=8004&r2=8005
==============================================================================
--- linux/trunk/drivers/dahdi/wcte12xp/wcte12xp.h (original)
+++ linux/trunk/drivers/dahdi/wcte12xp/wcte12xp.h Mon Feb  8 16:49:33 2010
@@ -77,8 +77,8 @@
 #define TYPE_T1	1
 #define TYPE_E1	2
 
-#define module_printk(fmt, args...) printk(KERN_INFO "%s: " fmt, te12xp_driver.name, ## args)
-#define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, te12xp_driver.name, __FUNCTION__, ## args)
+#define module_printk(fmt, args...) printk(KERN_INFO "%s: " fmt, THIS_MODULE->name, ## args)
+#define debug_printk(level, fmt, args...) if (debug >= level) printk(KERN_DEBUG "%s (%s): " fmt, THIS_MODULE->name, __FUNCTION__, ## args)
 extern spinlock_t ifacelock;
 
 struct command {