From: Simon Glass <sjg@chromium.org>
Date: Mon, 20 Apr 2015 18:37:20 +0000 (-0600)
Subject: dm: Remove unnecessary types in bcd.h
X-Git-Tag: v2025.01-rc5-pxa1908~13038^2~33
X-Git-Url: http://git.dujemihanovic.xyz/img/static/git-favicon.png?a=commitdiff_plain;h=be47aa65225113355d1dbbc870d480d95638a3d5;p=u-boot.git

dm: Remove unnecessary types in bcd.h

We don't need to use u8, and if we avoid it, it isn't so much of a problem
that rtc.h includes this header. With this change we can include rtc.h from
sandbox files.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/include/bcd.h b/include/bcd.h
index af4aa9c7ba..9ecd328284 100644
--- a/include/bcd.h
+++ b/include/bcd.h
@@ -10,14 +10,12 @@
 #ifndef _BCD_H
 #define _BCD_H
 
-#include <linux/types.h>
-
-static inline unsigned int bcd2bin(u8 val)
+static inline unsigned int bcd2bin(unsigned int val)
 {
-	return ((val) & 0x0f) + ((val) >> 4) * 10;
+	return ((val) & 0x0f) + ((val & 0xff) >> 4) * 10;
 }
 
-static inline u8 bin2bcd (unsigned int val)
+static inline unsigned int bin2bcd(unsigned int val)
 {
 	return (((val / 10) << 4) | (val % 10));
 }