Commit 0cae6efd authored by Tilman Schmidt's avatar Tilman Schmidt Committed by David S. Miller

isdn/gigaset: remove obsolete compile time options

Remove compile time options in the Gigaset ISDN driver that aren't
going to be changed anymore, and an obsolete FIXME comment.

Impact: cleanup
Signed-off-by: default avatarTilman Schmidt <tilman@imap.cc>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 18c2259c
...@@ -791,8 +791,6 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels, ...@@ -791,8 +791,6 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
spin_unlock_irqrestore(&cs->lock, flags); spin_unlock_irqrestore(&cs->lock, flags);
setup_timer(&cs->timer, timer_tick, (unsigned long) cs); setup_timer(&cs->timer, timer_tick, (unsigned long) cs);
cs->timer.expires = jiffies + msecs_to_jiffies(GIG_TICK); cs->timer.expires = jiffies + msecs_to_jiffies(GIG_TICK);
/* FIXME: can jiffies increase too much until the timer is added?
* Same problem(?) with mod_timer() in timer_tick(). */
add_timer(&cs->timer); add_timer(&cs->timer);
gig_dbg(DEBUG_INIT, "cs initialized"); gig_dbg(DEBUG_INIT, "cs initialized");
......
...@@ -1809,19 +1809,13 @@ static void process_command_flags(struct cardstate *cs) ...@@ -1809,19 +1809,13 @@ static void process_command_flags(struct cardstate *cs)
gig_dbg(DEBUG_EVENT, "Scheduling PC_CIDMODE"); gig_dbg(DEBUG_EVENT, "Scheduling PC_CIDMODE");
cs->commands_pending = 1; cs->commands_pending = 1;
return; return;
#ifdef GIG_MAYINITONDIAL
case M_UNKNOWN: case M_UNKNOWN:
schedule_init(cs, MS_INIT); schedule_init(cs, MS_INIT);
return; return;
#endif
} }
bcs->at_state.pending_commands &= ~PC_CID; bcs->at_state.pending_commands &= ~PC_CID;
cs->curchannel = bcs->channel; cs->curchannel = bcs->channel;
#ifdef GIG_RETRYCID
cs->retry_count = 2; cs->retry_count = 2;
#else
cs->retry_count = 1;
#endif
schedule_sequence(cs, &cs->at_state, SEQ_CID); schedule_sequence(cs, &cs->at_state, SEQ_CID);
return; return;
} }
......
...@@ -46,13 +46,6 @@ ...@@ -46,13 +46,6 @@
#define RBUFSIZE 8192 #define RBUFSIZE 8192
/* compile time options */
#define GIG_MAJOR 0
#define GIG_MAYINITONDIAL
#define GIG_RETRYCID
#define GIG_X75
#define GIG_TICK 100 /* in milliseconds */ #define GIG_TICK 100 /* in milliseconds */
/* timeout values (unit: 1 sec) */ /* timeout values (unit: 1 sec) */
......
...@@ -643,9 +643,7 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid) ...@@ -643,9 +643,7 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
iif->maxbufsize = MAX_BUF_SIZE; iif->maxbufsize = MAX_BUF_SIZE;
iif->features = ISDN_FEATURE_L2_TRANS | iif->features = ISDN_FEATURE_L2_TRANS |
ISDN_FEATURE_L2_HDLC | ISDN_FEATURE_L2_HDLC |
#ifdef GIG_X75
ISDN_FEATURE_L2_X75I | ISDN_FEATURE_L2_X75I |
#endif
ISDN_FEATURE_L3_TRANS | ISDN_FEATURE_L3_TRANS |
ISDN_FEATURE_P_EURO; ISDN_FEATURE_P_EURO;
iif->hl_hdrlen = HW_HDR_LEN; /* Area for storing ack */ iif->hl_hdrlen = HW_HDR_LEN; /* Area for storing ack */
......
...@@ -677,7 +677,6 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname, ...@@ -677,7 +677,6 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
goto enomem; goto enomem;
tty->magic = TTY_DRIVER_MAGIC, tty->magic = TTY_DRIVER_MAGIC,
tty->major = GIG_MAJOR,
tty->type = TTY_DRIVER_TYPE_SERIAL, tty->type = TTY_DRIVER_TYPE_SERIAL,
tty->subtype = SERIAL_TYPE_NORMAL, tty->subtype = SERIAL_TYPE_NORMAL,
tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment