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: Tilman Schmidt <tilman@imap.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 5d4befb81057a1c7675cb86d05b8cb82737495ec..3ca561eccd9f68dc85ccc26c99f37a4562485392 100644 (file)
--- a/drivers/isdn/gigaset/common.c
+++ b/drivers/isdn/gigaset/common.c
@@ -791,8 +791,6 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
        spin_unlock_irqrestore(&cs->lock, flags);
        setup_timer(&cs->timer, timer_tick, (unsigned long) cs);
        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);
 
        gig_dbg(DEBUG_INIT, "cs initialized");

diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
index 657757b7261841f7aa59be5a820235354c7c7955..a230ba707ff01666003b120ff71586e23bacf6fa 100644 (file)
--- a/drivers/isdn/gigaset/ev-layer.c
+++ b/drivers/isdn/gigaset/ev-layer.c
@@ -1809,19 +1809,13 @@ static void process_command_flags(struct cardstate *cs)
                                gig_dbg(DEBUG_EVENT, "Scheduling PC_CIDMODE");
                                cs->commands_pending = 1;
                                return;
-#ifdef GIG_MAYINITONDIAL
                        case M_UNKNOWN:
                                schedule_init(cs, MS_INIT);
                                return;
-#endif
                        }
                        bcs->at_state.pending_commands &= ~PC_CID;
                        cs->curchannel = bcs->channel;
-#ifdef GIG_RETRYCID
                        cs->retry_count = 2;
-#else
-                       cs->retry_count = 1;
-#endif
                        schedule_sequence(cs, &cs->at_state, SEQ_CID);
                        return;
                }

diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index ba9547ba34b5de2401a809971e07d69dd309b795..a69512fb11951d2930c97798c50c2c52acf7c069 100644 (file)
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -46,13 +46,6 @@
 
 #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 */
 
 /* timeout values (unit: 1 sec) */

diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index f01c3c2e2e46eb5f5194fa8afa8ba78e8d3b8532..1d084bbb7239bc7d4d341c590877999728868884 100644 (file)
--- a/drivers/isdn/gigaset/i4l.c
+++ b/drivers/isdn/gigaset/i4l.c
@@ -643,9 +643,7 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
        iif->maxbufsize = MAX_BUF_SIZE;
        iif->features = ISDN_FEATURE_L2_TRANS |
                ISDN_FEATURE_L2_HDLC |
-#ifdef GIG_X75
                ISDN_FEATURE_L2_X75I |
-#endif
                ISDN_FEATURE_L3_TRANS |
                ISDN_FEATURE_P_EURO;
        iif->hl_hdrlen = HW_HDR_LEN;            /* Area for storing ack */

diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index f45d68620161b3f3a04c1f6a2a2cf5c1e7e5218b..bb710d16a5264a378e81305438007a29bc0303d8 100644 (file)
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -677,7 +677,6 @@ void gigaset_if_initdriver(struct gigaset_driver *drv, const char *procname,
                goto enomem;
 
        tty->magic =            TTY_DRIVER_MAGIC,
-       tty->major =            GIG_MAJOR,
        tty->type =             TTY_DRIVER_TYPE_SERIAL,
        tty->subtype =          SERIAL_TYPE_NORMAL,
        tty->flags =            TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;