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

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

drivers/isdn/gigaset/common.c

+0 −2
Original line number Diff line number Diff line
@@ -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");

drivers/isdn/gigaset/ev-layer.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

		}

drivers/isdn/gigaset/gigaset.h

+0 −7
Original line number Diff line number Diff line
@@ -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) */

drivers/isdn/gigaset/i4l.c

+0 −2
Original line number Diff line number Diff line
@@ -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 */

drivers/isdn/gigaset/interface.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE