diff options
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 8 | ||||
| -rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 16 | ||||
| -rw-r--r-- | drivers/dahdi/wcte12xp/wcte12xp.h | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index 3d91269..976d744 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -288,7 +288,9 @@ static inline int empty_slot(struct wctdm *wc, int card) 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 @@ voicebus_current_latency_show(struct device *dev, 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 diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 50aafd4..4379600 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -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 loopback = 0; 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 @@ static const struct dahdi_echocan_ops vpm150m_ec_ops = { .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 @@ static struct pci_device_id te12xp_pci_tbl[] = { 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), diff --git a/drivers/dahdi/wcte12xp/wcte12xp.h b/drivers/dahdi/wcte12xp/wcte12xp.h index 904de0a..dd385bb 100644 --- a/drivers/dahdi/wcte12xp/wcte12xp.h +++ b/drivers/dahdi/wcte12xp/wcte12xp.h @@ -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 { |