aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2010-07-05 10:19:09 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-07 19:57:54 -0400
commit0cae6efdd7633624d8ecdec97a1d9e5a2a73352f (patch)
tree139ac68f40fd8a3e2901fa4734741e5395f67df8
parent18c2259c14d8595e64a802940422335d172a53db (diff)
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>
-rw-r--r--drivers/isdn/gigaset/common.c2
-rw-r--r--drivers/isdn/gigaset/ev-layer.c6
-rw-r--r--drivers/isdn/gigaset/gigaset.h7
-rw-r--r--drivers/isdn/gigaset/i4l.c2
-rw-r--r--drivers/isdn/gigaset/interface.c1
5 files changed, 0 insertions, 18 deletions
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
index 5d4befb81057..3ca561eccd9f 100644
--- 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,
791 spin_unlock_irqrestore(&cs->lock, flags); 791 spin_unlock_irqrestore(&cs->lock, flags);
792 setup_timer(&cs->timer, timer_tick, (unsigned long) cs); 792 setup_timer(&cs->timer, timer_tick, (unsigned long) cs);
793 cs->timer.expires = jiffies + msecs_to_jiffies(GIG_TICK); 793 cs->timer.expires = jiffies + msecs_to_jiffies(GIG_TICK);
794 /* FIXME: can jiffies increase too much until the timer is added?
795 * Same problem(?) with mod_timer() in timer_tick(). */
796 add_timer(&cs->timer); 794 add_timer(&cs->timer);
797 795
798 gig_dbg(DEBUG_INIT, "cs initialized"); 796 gig_dbg(DEBUG_INIT, "cs initialized");
diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c
index 657757b72618..a230ba707ff0 100644
--- 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)
1809 gig_dbg(DEBUG_EVENT, "Scheduling PC_CIDMODE"); 1809 gig_dbg(DEBUG_EVENT, "Scheduling PC_CIDMODE");
1810 cs->commands_pending = 1; 1810 cs->commands_pending = 1;
1811 return; 1811 return;
1812#ifdef GIG_MAYINITONDIAL
1813 case M_UNKNOWN: 1812 case M_UNKNOWN:
1814 schedule_init(cs, MS_INIT); 1813 schedule_init(cs, MS_INIT);
1815 return; 1814 return;
1816#endif
1817 } 1815 }
1818 bcs->at_state.pending_commands &= ~PC_CID; 1816 bcs->at_state.pending_commands &= ~PC_CID;
1819 cs->curchannel = bcs->channel; 1817 cs->curchannel = bcs->channel;
1820#ifdef GIG_RETRYCID
1821 cs->retry_count = 2; 1818 cs->retry_count = 2;
1822#else
1823 cs->retry_count = 1;
1824#endif
1825 schedule_sequence(cs, &cs->at_state, SEQ_CID); 1819 schedule_sequence(cs, &cs->at_state, SEQ_CID);
1826 return; 1820 return;
1827 } 1821 }
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
index ba9547ba34b5..a69512fb1195 100644
--- a/drivers/isdn/gigaset/gigaset.h
+++ b/drivers/isdn/gigaset/gigaset.h
@@ -46,13 +46,6 @@
46 46
47#define RBUFSIZE 8192 47#define RBUFSIZE 8192
48 48
49/* compile time options */
50#define GIG_MAJOR 0
51
52#define GIG_MAYINITONDIAL
53#define GIG_RETRYCID
54#define GIG_X75
55
56#define GIG_TICK 100 /* in milliseconds */ 49#define GIG_TICK 100 /* in milliseconds */
57 50
58/* timeout values (unit: 1 sec) */ 51/* timeout values (unit: 1 sec) */
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c
index f01c3c2e2e46..1d084bbb7239 100644
--- 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)
643 iif->maxbufsize = MAX_BUF_SIZE; 643 iif->maxbufsize = MAX_BUF_SIZE;
644 iif->features = ISDN_FEATURE_L2_TRANS | 644 iif->features = ISDN_FEATURE_L2_TRANS |
645 ISDN_FEATURE_L2_HDLC | 645 ISDN_FEATURE_L2_HDLC |
646#ifdef GIG_X75
647 ISDN_FEATURE_L2_X75I | 646 ISDN_FEATURE_L2_X75I |
648#endif
649 ISDN_FEATURE_L3_TRANS | 647 ISDN_FEATURE_L3_TRANS |
650 ISDN_FEATURE_P_EURO; 648 ISDN_FEATURE_P_EURO;
651 iif->hl_hdrlen = HW_HDR_LEN; /* Area for storing ack */ 649 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 f45d68620161..bb710d16a526 100644
--- 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,
677 goto enomem; 677 goto enomem;
678 678
679 tty->magic = TTY_DRIVER_MAGIC, 679 tty->magic = TTY_DRIVER_MAGIC,
680 tty->major = GIG_MAJOR,
681 tty->type = TTY_DRIVER_TYPE_SERIAL, 680 tty->type = TTY_DRIVER_TYPE_SERIAL,
682 tty->subtype = SERIAL_TYPE_NORMAL, 681 tty->subtype = SERIAL_TYPE_NORMAL,
683 tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; 682 tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;