Commit 8e763de0 authored by Kees Cook's avatar Kees Cook Committed by David S. Miller
Browse files

net/hamradio/6pack: Convert timers to use timer_setup() 



In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Andreas Koensgen <ajk@comnets.uni-bremen.de>
Cc: linux-hams@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e8b824d

drivers/net/hamradio/6pack.c

+7 −13
Original line number Diff line number Diff line
@@ -136,9 +136,9 @@ static int encode_sixpack(unsigned char *, unsigned char *, int, unsigned char); 
 * Note that in case of DAMA operation, the data is not sent here.

 */



static void sp_xmit_on_air(unsigned long channel)

static void sp_xmit_on_air(struct timer_list *t)

{

	struct sixpack *sp = (struct sixpack *) channel;

	struct sixpack *sp = from_timer(sp, t, tx_t);

	int actual, when = sp->slottime;

	static unsigned char random;
@@ -229,7 +229,7 @@ static void sp_encaps(struct sixpack *sp, unsigned char *icp, int len) 
		sp->xleft = count;

		sp->xhead = sp->xbuff;

		sp->status2 = count;

		sp_xmit_on_air((unsigned long)sp);

		sp_xmit_on_air(&sp->tx_t);

	}



	return;
@@ -500,9 +500,9 @@ static inline void tnc_set_sync_state(struct sixpack *sp, int new_tnc_state) 
		__tnc_set_sync_state(sp, new_tnc_state);

}



static void resync_tnc(unsigned long channel)

static void resync_tnc(struct timer_list *t)

{

	struct sixpack *sp = (struct sixpack *) channel;

	struct sixpack *sp = from_timer(sp, t, resync_t);

	static char resync_cmd = 0xe8;



	/* clear any data that might have been received */
@@ -526,8 +526,6 @@ static void resync_tnc(unsigned long channel) 
	/* Start resync timer again -- the TNC might be still absent */



	del_timer(&sp->resync_t);

	sp->resync_t.data	= (unsigned long) sp;

	sp->resync_t.function	= resync_tnc;

	sp->resync_t.expires	= jiffies + SIXP_RESYNC_TIMEOUT;

	add_timer(&sp->resync_t);

}
@@ -541,8 +539,6 @@ static inline int tnc_init(struct sixpack *sp) 
	sp->tty->ops->write(sp->tty, &inbyte, 1);



	del_timer(&sp->resync_t);

	sp->resync_t.data = (unsigned long) sp;

	sp->resync_t.function = resync_tnc;

	sp->resync_t.expires = jiffies + SIXP_RESYNC_TIMEOUT;

	add_timer(&sp->resync_t);
@@ -623,9 +619,9 @@ static int sixpack_open(struct tty_struct *tty) 


	netif_start_queue(dev);



	setup_timer(&sp->tx_t, sp_xmit_on_air, (unsigned long)sp);

	timer_setup(&sp->tx_t, sp_xmit_on_air, 0);



	init_timer(&sp->resync_t);

	timer_setup(&sp->resync_t, resync_tnc, 0);



	spin_unlock_bh(&sp->lock);
@@ -926,8 +922,6 @@ static void decode_prio_command(struct sixpack *sp, unsigned char cmd) 


	if (sp->tnc_state == TNC_IN_SYNC) {

		del_timer(&sp->resync_t);

		sp->resync_t.data	= (unsigned long) sp;

		sp->resync_t.function	= resync_tnc;

		sp->resync_t.expires	= jiffies + SIXP_INIT_RESYNC_TIMEOUT;

		add_timer(&sp->resync_t);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE