From 180c0aec701a00ffdd226552a4cde0790447bf8c Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 8 Mar 2004 21:35:04 -0800 Subject: [PATCH] [IRDA]: Make irda_start_timer inline rather than exporting. --- include/net/irda/timer.h | 14 ++++++++++++-- net/irda/irsyms.c | 1 - net/irda/timer.c | 23 ----------------------- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/include/net/irda/timer.h b/include/net/irda/timer.h index 61103a361d6ef..9d24d6c033dc1 100644 --- a/include/net/irda/timer.h +++ b/include/net/irda/timer.h @@ -71,8 +71,18 @@ struct lap_cb; typedef void (*TIMER_CALLBACK)(void *); -void irda_start_timer(struct timer_list *ptimer, int timeout, void* data, - TIMER_CALLBACK callback); +static inline void irda_start_timer(struct timer_list *ptimer, int timeout, + void* data, TIMER_CALLBACK callback) +{ + ptimer->function = (void (*)(unsigned long)) callback; + ptimer->data = (unsigned long) data; + + /* Set new value for timer (update or add timer). + * We use mod_timer() because it's more efficient and also + * safer with respect to race conditions - Jean II */ + mod_timer(ptimer, jiffies + timeout); +} + void irlap_start_slot_timer(struct irlap_cb *self, int timeout); void irlap_start_query_timer(struct irlap_cb *self, int timeout); diff --git a/net/irda/irsyms.c b/net/irda/irsyms.c index 985bc86565aa5..26cae78fdb6f2 100644 --- a/net/irda/irsyms.c +++ b/net/irda/irsyms.c @@ -97,7 +97,6 @@ EXPORT_SYMBOL(irda_task_execute); EXPORT_SYMBOL(irda_task_next_state); EXPORT_SYMBOL(irda_task_delete); -EXPORT_SYMBOL(irda_start_timer); #ifdef CONFIG_IRDA_DEBUG __u32 irda_debug = IRDA_DEBUG_LEVEL; diff --git a/net/irda/timer.c b/net/irda/timer.c index b14e3f703b289..f05b94250ffa6 100644 --- a/net/irda/timer.c +++ b/net/irda/timer.c @@ -41,29 +41,6 @@ static void irlap_wd_timer_expired(void* data); static void irlap_backoff_timer_expired(void* data); static void irlap_media_busy_expired(void* data); -/* - * Function irda_start_timer (timer, timeout) - * - * Start an IrDA timer - * - */ -void irda_start_timer(struct timer_list *ptimer, int timeout, void *data, - TIMER_CALLBACK callback) -{ - /* - * For most architectures void * is the same as unsigned long, but - * at least we try to use void * as long as possible. Since the - * timer functions use unsigned long, we cast the function here - */ - ptimer->function = (void (*)(unsigned long)) callback; - ptimer->data = (unsigned long) data; - - /* Set new value for timer (update or add timer). - * We use mod_timer() because it's more efficient and also - * safer with respect to race conditions - Jean II */ - mod_timer(ptimer, jiffies + timeout); -} - void irlap_start_slot_timer(struct irlap_cb *self, int timeout) { irda_start_timer(&self->slot_timer, timeout, (void *) self, -- 2.53.0