Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4346f654 authored Apr 30, 2008 by Oliver Hartkopp Committed by Thomas Gleixner May 03, 2008

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>

parent b66e1f11

include/linux/hrtimer.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -316,6 +316,15 @@ static inline int hrtimer_is_queued(struct hrtimer *timer)
		(HRTIMER_STATE_ENQUEUED \| HRTIMER_STATE_PENDING);
		}

		/*
		* Helper function to check, whether the timer is running the callback
		* function
		*/
		static inline int hrtimer_callback_running(struct hrtimer *timer)
		{
		return timer->state & HRTIMER_STATE_CALLBACK;
		}

		/* Forward a hrtimer so it expires after now: */
		extern u64
		hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);

kernel/hrtimer.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -153,15 +153,6 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)
		ktime_add(xtim, tomono);
		}

		/*
		* Helper function to check, whether the timer is running the callback
		* function
		*/
		static inline int hrtimer_callback_running(struct hrtimer *timer)
		{
		return timer->state & HRTIMER_STATE_CALLBACK;
		}

		/*
		* Functions and macros which are different for UP/SMP systems are kept in a
		* single place

net/can/bcm.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -412,12 +412,6 @@ static void bcm_rx_changed(struct bcm_op op, struct can_frame data)
		bcm_send_to_user(op, &head, data, 1);
		}

		/* TODO: move to linux/hrtimer.h */
		static inline int hrtimer_callback_running(struct hrtimer *timer)
		{
		return timer->state & HRTIMER_STATE_CALLBACK;
		}

		/*
		* bcm_rx_update_and_send - process a detected relevant receive content change
		* 1. update the last received data