aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/capi/kcapi_proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/isdn/capi/kcapi_proc.c')
-rw-r--r--drivers/isdn/capi/kcapi_proc.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
index 09d4db764d22..59fd16a4ad8e 100644
--- a/drivers/isdn/capi/kcapi_proc.c
+++ b/drivers/isdn/capi/kcapi_proc.c
@@ -15,13 +15,12 @@
15#include <linux/seq_file.h> 15#include <linux/seq_file.h>
16#include <linux/init.h> 16#include <linux/init.h>
17 17
18static char * 18static char *state2str(unsigned short state)
19cardstate2str(unsigned short cardstate)
20{ 19{
21 switch (cardstate) { 20 switch (state) {
22 case CARD_DETECTED: return "detected"; 21 case CAPI_CTR_DETECTED: return "detected";
23 case CARD_LOADING: return "loading"; 22 case CAPI_CTR_LOADING: return "loading";
24 case CARD_RUNNING: return "running"; 23 case CAPI_CTR_RUNNING: return "running";
25 default: return "???"; 24 default: return "???";
26 } 25 }
27} 26}
@@ -38,7 +37,7 @@ cardstate2str(unsigned short cardstate)
38static void *controller_start(struct seq_file *seq, loff_t *pos) 37static void *controller_start(struct seq_file *seq, loff_t *pos)
39{ 38{
40 if (*pos < CAPI_MAXCONTR) 39 if (*pos < CAPI_MAXCONTR)
41 return &capi_cards[*pos]; 40 return &capi_controller[*pos];
42 41
43 return NULL; 42 return NULL;
44} 43}
@@ -47,7 +46,7 @@ static void *controller_next(struct seq_file *seq, void *v, loff_t *pos)
47{ 46{
48 ++*pos; 47 ++*pos;
49 if (*pos < CAPI_MAXCONTR) 48 if (*pos < CAPI_MAXCONTR)
50 return &capi_cards[*pos]; 49 return &capi_controller[*pos];
51 50
52 return NULL; 51 return NULL;
53} 52}
@@ -65,7 +64,7 @@ static int controller_show(struct seq_file *seq, void *v)
65 64
66 seq_printf(seq, "%d %-10s %-8s %-16s %s\n", 65 seq_printf(seq, "%d %-10s %-8s %-16s %s\n",
67 ctr->cnr, ctr->driver_name, 66 ctr->cnr, ctr->driver_name,
68 cardstate2str(ctr->cardstate), 67 state2str(ctr->state),
69 ctr->name, 68 ctr->name,
70 ctr->procinfo ? ctr->procinfo(ctr) : ""); 69 ctr->procinfo ? ctr->procinfo(ctr) : "");
71 70