diff options
author | Oliver Hartkopp <oliver@hartkopp.net> | 2008-04-30 17:04:37 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-03 12:11:48 -0400 |
commit | 4346f65426cbceb64794b468e4af6f5632d58c5e (patch) | |
tree | cd698a910a2526882d542984ccd314d109a5194a /net/can | |
parent | b66e1f11ebc429569a3784aaf64123633d9e3ed1 (diff) |
hrtimer: remove duplicate helper function
The helper function hrtimer_callback_running() is used in
kernel/hrtimer.c as well as in the updated net/can/bcm.c which now
supports hrtimers. Moving the helper function to hrtimer.h removes the
duplicate definition in the C-files.
Signed-off-by: Oliver Hartkopp <oliver@hartkopp.net>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/can')
-rw-r--r-- | net/can/bcm.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index 74fd2d33aff4..d9a3a9d13bed 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c | |||
@@ -412,12 +412,6 @@ static void bcm_rx_changed(struct bcm_op *op, struct can_frame *data) | |||
412 | bcm_send_to_user(op, &head, data, 1); | 412 | bcm_send_to_user(op, &head, data, 1); |
413 | } | 413 | } |
414 | 414 | ||
415 | /* TODO: move to linux/hrtimer.h */ | ||
416 | static inline int hrtimer_callback_running(struct hrtimer *timer) | ||
417 | { | ||
418 | return timer->state & HRTIMER_STATE_CALLBACK; | ||
419 | } | ||
420 | |||
421 | /* | 415 | /* |
422 | * bcm_rx_update_and_send - process a detected relevant receive content change | 416 | * bcm_rx_update_and_send - process a detected relevant receive content change |
423 | * 1. update the last received data | 417 | * 1. update the last received data |