mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH] clock: remove duplicate xdelay declarations
Date: Wed, 23 Sep 2015 15:14:32 +0200	[thread overview]
Message-ID: <1443014072-19110-1-git-send-email-s.hauer@pengutronix.de> (raw)

ndelay is declared in include/clock.h, udelay in include/common.h and
mdelay in include/common.h and include/clock.h. Move them all to
include/clock.h and remove duplicates.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 include/clock.h  | 3 +--
 include/common.h | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/clock.h b/include/clock.h
index 691befc..681e3ad 100644
--- a/include/clock.h
+++ b/include/clock.h
@@ -34,9 +34,8 @@ uint32_t clocksource_hz2mult(uint32_t hz, uint32_t shift_constant);
 int is_timeout(uint64_t start_ns, uint64_t time_offset_ns);
 int is_timeout_non_interruptible(uint64_t start_ns, uint64_t time_offset_ns);
 
-// void udelay(unsigned long usecs);
-
 void ndelay(unsigned long nsecs);
+void udelay(unsigned long usecs);
 void mdelay(unsigned long msecs);
 
 #define SECOND ((uint64_t)(1000 * 1000 * 1000))
diff --git a/include/common.h b/include/common.h
index 553a7f4..03ceec2 100644
--- a/include/common.h
+++ b/include/common.h
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <module.h>
 #include <config.h>
+#include <clock.h>
 #include <linux/bitops.h>
 #include <linux/types.h>
 #include <linux/string.h>
@@ -69,10 +70,6 @@ long	get_ram_size  (volatile long *, long);
 /* $(CPU)/cpu.c */
 void __noreturn poweroff(void);
 
-/* lib_$(ARCH)/time.c */
-void	udelay (unsigned long);
-void	mdelay (unsigned long);
-
 /* lib_generic/crc32.c */
 uint32_t crc32(uint32_t, const void*, unsigned int);
 uint32_t crc32_no_comp(uint32_t, const void*, unsigned int);
-- 
2.5.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

                 reply	other threads:[~2015-09-23 13:14 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1443014072-19110-1-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox