[PATCH] hrtimer: remove duplicate helper function

[PATCH] hrtimer: remove duplicate helper function

[Oliver Hartkopp]

[-- Attachment #1: Type: text/plain, Size: 625 bytes --]

from Oliver Hartkopp <oliver@hartkopp.net>

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: Thomas Gleixner <tglx@linutronix.de>

---

Hello Thomas,

as discussed on the OSADL workshop here is the removal of my duplicate 
definition of your helper function in net/can/bcm.c .

The patch applies fine on Linus' current tree for the 2.6.26 merge.

Thanks & best regards,
Oliver




[-- Attachment #2: hrtimer_remove_duplicate_helper_function --]
[-- Type: text/plain, Size: 1744 bytes --]

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 31a4d65..6d93dce 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -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);
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 9af1d6a..421be5f 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -154,15 +154,6 @@ static void hrtimer_get_softirq_time(struct hrtimer_cpu_base *base)
 }
 
 /*
- * 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
  */
diff --git a/net/can/bcm.c b/net/can/bcm.c
index 74fd2d3..d9a3a9d 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)
 	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

Re: [PATCH] hrtimer: remove duplicate helper function

[Thomas Gleixner]

Oliver,

On Wed, 30 Apr 2008, Oliver Hartkopp wrote:
> from Oliver Hartkopp <oliver@hartkopp.net>
> 
> 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: Thomas Gleixner <tglx@linutronix.de>

Applied. Thanks,

	 tglx