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>

2 files changed, 16 insertions, 29 deletions

diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c
index 9433a88a33c..65c9204ab9a 100644
--- a/arch/m68k/bvme6000/config.c
+++ b/arch/m68k/bvme6000/config.c
@@ -25,6 +25,7 @@
 #include <linux/genhd.h>
 #include <linux/rtc.h>
 #include <linux/interrupt.h>
+#include <linux/bcd.h>
 
 #include <asm/bootinfo.h>
 #include <asm/system.h>
@@ -46,9 +47,6 @@ extern void bvme6000_reset (void);
 extern void bvme6000_waitbut(void);
 void bvme6000_set_vectors (void);
 
-static unsigned char bcd2bin (unsigned char b);
-static unsigned char bin2bcd (unsigned char b);
-
 /* Save tick handler routine pointer, will point to do_timer() in
  * kernel/sched.c, called via bvme6000_process_int() */
 
@@ -264,17 +262,6 @@ unsigned long bvme6000_gettimeoffset (void)
     return v;
 }
 
-static unsigned char bcd2bin (unsigned char b)
-{
-        return ((b>>4)*10 + (b&15));
-}
-
-static unsigned char bin2bcd (unsigned char b)
-{
-        return (((b/10)*16) + (b%10));
-}
-
-
 /*
  * Looks like op is non-zero for setting the clock, and zero for
  * reading the clock.
diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c
index e8ac3f7d72d..808c9018b11 100644
--- a/arch/m68k/bvme6000/rtc.c
+++ b/arch/m68k/bvme6000/rtc.c
@@ -57,16 +57,16 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                 rtc->msr = 0x40;
                 memset(&wtime, 0, sizeof(struct rtc_time));
                 do {
-                        wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
-                        wtime.tm_min =  BCD2BIN(rtc->bcd_min);
-                        wtime.tm_hour = BCD2BIN(rtc->bcd_hr);
-                        wtime.tm_mday =  BCD2BIN(rtc->bcd_dom);
-                        wtime.tm_mon =  BCD2BIN(rtc->bcd_mth)-1;
-                        wtime.tm_year = BCD2BIN(rtc->bcd_year);
+                        wtime.tm_sec =  bcd2bin(rtc->bcd_sec);
+                        wtime.tm_min =  bcd2bin(rtc->bcd_min);
+                        wtime.tm_hour = bcd2bin(rtc->bcd_hr);
+                        wtime.tm_mday =  bcd2bin(rtc->bcd_dom);
+                        wtime.tm_mon =  bcd2bin(rtc->bcd_mth)-1;
+                        wtime.tm_year = bcd2bin(rtc->bcd_year);
                         if (wtime.tm_year < 70)
                                 wtime.tm_year += 100;
-                        wtime.tm_wday = BCD2BIN(rtc->bcd_dow)-1;
-                } while (wtime.tm_sec != BCD2BIN(rtc->bcd_sec));
+                        wtime.tm_wday = bcd2bin(rtc->bcd_dow)-1;
+                } while (wtime.tm_sec != bcd2bin(rtc->bcd_sec));
                 rtc->msr = msr;
                 local_irq_restore(flags);
                 return copy_to_user(argp, &wtime, sizeof wtime) ?
@@ -114,14 +114,14 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
                 rtc->t0cr_rtmr = yrs%4;
                 rtc->bcd_tenms = 0;
-                rtc->bcd_sec   = BIN2BCD(sec);
-                rtc->bcd_min   = BIN2BCD(min);
-                rtc->bcd_hr    = BIN2BCD(hrs);
-                rtc->bcd_dom   = BIN2BCD(day);
-                rtc->bcd_mth   = BIN2BCD(mon);
-                rtc->bcd_year  = BIN2BCD(yrs%100);
+                rtc->bcd_sec   = bin2bcd(sec);
+                rtc->bcd_min   = bin2bcd(min);
+                rtc->bcd_hr    = bin2bcd(hrs);
+                rtc->bcd_dom   = bin2bcd(day);
+                rtc->bcd_mth   = bin2bcd(mon);
+                rtc->bcd_year  = bin2bcd(yrs%100);
                 if (rtc_tm.tm_wday >= 0)
-                        rtc->bcd_dow = BIN2BCD(rtc_tm.tm_wday+1);
+                        rtc->bcd_dow = bin2bcd(rtc_tm.tm_wday+1);
                 rtc->t0cr_rtmr = yrs%4 | 0x08;
 
                 rtc->msr = msr;