diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-10-13 21:58:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 19:23:26 +0200 |
| commit | 5b1d5f953bbb50dcbdf93719cb622aa128ba7527 (patch) | |
| tree | d1f826b007e909bbf340498376c83a0452359af4 /arch/m68k/q40 | |
| parent | 8250: Fix lock warning (and possible crash) (diff) | |
| download | linux-5b1d5f953bbb50dcbdf93719cb622aa128ba7527.tar.xz linux-5b1d5f953bbb50dcbdf93719cb622aa128ba7527.zip | |
m68k: use bcd2bin/bin2bcd
This patch changes m68k to use the new bcd2bin/bin2bcd functions instead
of the obsolete BCD_TO_BIN/BIN_TO_BCD/BCD2BIN/BIN2BCD macros.
It also remove local bcd2bin/bin2bcd implementations
in favor of the global ones.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/q40')
| -rw-r--r-- | arch/m68k/q40/config.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index be9de2f3dc48..9c7eefa3f98a 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c @@ -23,6 +23,7 @@ #include <linux/serial_reg.h> #include <linux/rtc.h> #include <linux/vt_kern.h> +#include <linux/bcd.h> #include <asm/io.h> #include <asm/rtc.h> @@ -216,17 +217,6 @@ int q40_parse_bootinfo(const struct bi_record *rec) } -static inline unsigned char bcd2bin(unsigned char b) -{ - return (b >> 4) * 10 + (b & 15); -} - -static inline unsigned char bin2bcd(unsigned char b) -{ - return (b / 10) * 16 + (b % 10); -} - - static unsigned long q40_gettimeoffset(void) { return 5000 * (ql_ticks != 0); |