ISDN: Remove ISDN_STAT_NODCH

It was never used anywhere (except for debugging output).
  
Also, fix some compiler warnings.

drivers/isdn/i4l/isdn_common.c

@@ -226,7 +226,6 @@ static int
 slot_bconn(struct fsm_inst *fi, int pr, void *arg)
 {
 	struct isdn_slot *slot = fi->userdata;
-	int sl = slot - slots;
 	isdn_ctrl *ctrl = arg;
 
 	fsm_change_state(fi, ST_SLOT_ACTIVE);
@@ -242,7 +241,6 @@ static int
 slot_bhup(struct fsm_inst *fi, int pr, void *arg)
 {
 	struct isdn_slot *slot = fi->userdata;
-	int sl = slot - slots;
 	isdn_ctrl *ctrl = arg;
 
 	fsm_change_state(fi, ST_SLOT_WAIT_DHUP);
@@ -255,7 +253,6 @@ static int
 slot_dhup(struct fsm_inst *fi, int pr, void *arg)
 {
 	struct isdn_slot *slot = fi->userdata;
-	int sl = slot - slots;
 	isdn_ctrl *ctrl = arg;
 
 	fsm_change_state(fi, ST_SLOT_BOUND);
@@ -314,7 +311,6 @@ static int
 slot_bsent(struct fsm_inst *fi, int pr, void *arg)
 {
 	struct isdn_slot *slot = fi->userdata;
-	int sl = slot - slots;
 	isdn_ctrl *ctrl = arg;
 
 	do_stat_cb(slot, ctrl);
@@ -489,10 +485,10 @@ struct isdn_driver {
 	isdn_if            *interface;        /* Interface to driver         */
 	int                *rcverr;           /* Error-counters for B rx     */
 	int                *rcvcount;         /* Byte-counters for B rx      */
+	struct sk_buff_head *rpqueue;
 #ifdef CONFIG_ISDN_AUDIO
 	unsigned long      DLEflag;           /* Insert DLE at next read     */
 #endif
-	struct sk_buff_head *rpqueue;         /* Pointers to rx queue        */
 	char               msn2eaz[10][ISDN_MSNLEN];  /*  MSN->EAZ           */
 	struct fsm_inst    fi;
 } driver;
@@ -1255,15 +1251,6 @@ isdn_status_callback(isdn_ctrl * c)
 			break;
 #endif
 #if 0 // FIXME
-		case ISDN_STAT_NODCH:
-			if (i < 0)
-				return -1;
-			dbg_statcallb("NODCH: %ld\n", c->arg);
-			if (isdn_net_stat_callback(i, c))
-				break;
-			if (isdn_tty_stat_callback(i, c))
-				break;
-			break;
 		case ISDN_STAT_DISCH:
 			save_flags(flags);
 			cli();

drivers/isdn/i4l/isdn_common.h

@@ -66,7 +66,7 @@ extern int isdn_msncmp( const char *,  const char *);
 #if defined(ISDN_DEBUG_NET_DUMP) || defined(ISDN_DEBUG_MODEM_DUMP)
 extern void isdn_dumppkt(char *, u_char *, int, int);
 #else
-static inline void isdn_dumppkt(char *s, char *ss, u_char *d, int l, int m) { }
+static inline void isdn_dumppkt(char *s, u_char *d, int l, int m) { }
 #endif
 
 struct dial_info {

drivers/isdn/i4l/isdn_tty.c

@@ -2349,22 +2349,6 @@ isdn_tty_stat_callback(int i, isdn_ctrl *c)
 					return 1;
 				}
 				break;
-			case ISDN_STAT_NODCH:
-#ifdef ISDN_TTY_STAT_DEBUG
-				printk(KERN_DEBUG "tty_STAT_NODCH ttyI%d\n", info->line);
-#endif
-				if (TTY_IS_ACTIVE(info)) {
-					if (info->dialing) {
-						info->dialing = 0;
-						info->last_l2 = -1;
-						info->last_si = 0;
-						sprintf(info->last_cause, "0000");
-						isdn_tty_modem_result(RESULT_NO_DIALTONE, info);
-					}
-					isdn_tty_modem_hup(info, 0);
-					return 1;
-				}
-				break;
 			case ISDN_STAT_UNLOAD:
 #ifdef ISDN_TTY_STAT_DEBUG
 				printk(KERN_DEBUG "tty_STAT_UNLOAD ttyI%d\n", info->line);

drivers/isdn/icn/icn.c

@@ -424,7 +424,6 @@ static icn_stat icn_stat_table[] =
 	{"AOC",            ISDN_STAT_CINF,  6},	/* Charge-info, DSS1-type     */
 	{"CAU",            ISDN_STAT_CAUSE, 7},	/* Cause code                 */
 	{"TEI OK",         ISDN_STAT_RUN,   0},	/* Card connected to wallplug */
-	{"NO D-CHAN",      ISDN_STAT_NODCH, 0},	/* No D-channel available     */
 	{"E_L1: ACT FAIL", ISDN_STAT_BHUP,  8},	/* Layer-1 activation failed  */
 	{"E_L2: DATA LIN", ISDN_STAT_BHUP,  8},	/* Layer-2 data link lost     */
 	{"E_L1: ACTIVATION FAILED",

drivers/isdn/isdnloop/isdnloop.c

@@ -166,7 +166,6 @@ static isdnloop_stat isdnloop_stat_table[] =
 	{"AOC",            ISDN_STAT_CINF,  6}, /* Charge-info, DSS1-type     */
 	{"CAU",            ISDN_STAT_CAUSE, 7}, /* Cause code                 */
 	{"TEI OK",         ISDN_STAT_RUN,   0}, /* Card connected to wallplug */
-	{"NO D-CHAN",      ISDN_STAT_NODCH, 0}, /* No D-channel available     */
 	{"E_L1: ACT FAIL", ISDN_STAT_BHUP,  8}, /* Layer-1 activation failed  */
 	{"E_L2: DATA LIN", ISDN_STAT_BHUP,  8}, /* Layer-2 data link lost     */
 	{"E_L1: ACTIVATION FAILED",

include/linux/isdnif.h

@@ -202,7 +202,6 @@ typedef struct
 #define ISDN_STAT_LOAD    265    /* Signal new lowlevel-driver is loaded  */
 #define ISDN_STAT_UNLOAD  266    /* Signal unload of lowlevel-driver      */
 #define ISDN_STAT_BSENT   267    /* Signal packet sent                    */
-#define ISDN_STAT_NODCH   268    /* Signal no D-Channel                   */
 #define ISDN_STAT_ADDCH   269    /* Add more Channels                     */
 #define ISDN_STAT_CAUSE   270    /* Cause-Message                         */
 #define ISDN_STAT_ICALLW  271    /* Incoming call without B-chan waiting  */