summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2009-11-07 00:35:38 +0000
committerShaun Ruffell <sruffell@digium.com>2009-11-07 00:35:38 +0000
commite36e42b2b45b0beea68a492d68316fac1573ee1e (patch)
treeb28e8ddd0ab5ee04242953de58d057c643cb6f11
parenteb4faeba8f469eccf2ee5ba2f96cd30b6ed03134 (diff)
wcte12xp: Remove unused flag member and make const the t1_descs.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7512 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/wcte12xp/base.c9
-rw-r--r--drivers/dahdi/wcte12xp/wcte12xp.h2
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c
index 672a7f6..a915ce7 100644
--- a/drivers/dahdi/wcte12xp/base.c
+++ b/drivers/dahdi/wcte12xp/base.c
@@ -87,13 +87,12 @@ struct t1 *ifaces[WC_MAX_IFACES];
spinlock_t ifacelock = SPIN_LOCK_UNLOCKED;
struct t1_desc {
- char *name;
- int flags;
+ const char *name;
};
-static struct t1_desc te120p = { "Wildcard TE120P", 0 };
-static struct t1_desc te122 = { "Wildcard TE122", 0 };
-static struct t1_desc te121 = { "Wildcard TE121", 0 };
+static const struct t1_desc te120p = {"Wildcard TE120P"};
+static const struct t1_desc te122 = {"Wildcard TE122"};
+static const struct t1_desc te121 = {"Wildcard TE121"};
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
static kmem_cache_t *cmd_cache;
diff --git a/drivers/dahdi/wcte12xp/wcte12xp.h b/drivers/dahdi/wcte12xp/wcte12xp.h
index 83f8268..d6c5d7e 100644
--- a/drivers/dahdi/wcte12xp/wcte12xp.h
+++ b/drivers/dahdi/wcte12xp/wcte12xp.h
@@ -108,7 +108,7 @@ struct t1 {
int losalarmcount;
int aisalarmcount;
int yelalarmcount;
- char *variety;
+ const char *variety;
char name[80];
unsigned long blinktimer;
int loopupcnt;