2 files changed, 18 insertions, 23 deletions

diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index 24cbc3030454..1521826fc3c7 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -17,6 +17,7 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
+#include <linux/seq_file.h>
 #include <linux/tty.h>
 #include <linux/console.h>
 #include <linux/linkage.h>
@@ -42,7 +43,6 @@ extern t_bdid mvme_bdid;
 static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;
 
 static void mvme16x_get_model(char *model);
-static int  mvme16x_get_hardware_list(char *buffer);
 extern void mvme16x_sched_init(irq_handler_t handler);
 extern unsigned long mvme16x_gettimeoffset (void);
 extern int mvme16x_hwclk (int, struct rtc_time *);
@@ -93,26 +93,21 @@ static void mvme16x_get_model(char *model)
 }
 
 
-static int mvme16x_get_hardware_list(char *buffer)
+static void mvme16x_get_hardware_list(struct seq_file *m)
 {
     p_bdid p = &mvme_bdid;
-    int len = 0;
 
     if (p->brdno == 0x0162 || p->brdno == 0x0172)
     {
         unsigned char rev = *(unsigned char *)MVME162_VERSION_REG;
 
-        len += sprintf (buffer+len, "VMEchip2        %spresent\n",
+        seq_printf (m, "VMEchip2        %spresent\n",
                         rev & MVME16x_CONFIG_NO_VMECHIP2 ? "NOT " : "");
-        len += sprintf (buffer+len, "SCSI interface  %spresent\n",
+        seq_printf (m, "SCSI interface  %spresent\n",
                         rev & MVME16x_CONFIG_NO_SCSICHIP ? "NOT " : "");
-        len += sprintf (buffer+len, "Ethernet i/f    %spresent\n",
+        seq_printf (m, "Ethernet i/f    %spresent\n",
                         rev & MVME16x_CONFIG_NO_ETHERNET ? "NOT " : "");
     }
-    else
-        *buffer = '\0';
-
-    return (len);
 }
 
 /*
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c
index 432a9f13b2ed..cea5e3e4e636 100644
--- a/arch/m68k/mvme16x/rtc.c
+++ b/arch/m68k/mvme16x/rtc.c
@@ -52,15 +52,15 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                 /* Ensure clock and real-time-mode-register are accessible */
                 rtc->ctrl = RTC_READ;
                 memset(&wtime, 0, sizeof(struct rtc_time));
-                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;
+                wtime.tm_wday = bcd2bin(rtc->bcd_dow)-1;
                 rtc->ctrl = 0;
                 local_irq_restore(flags);
                 return copy_to_user(argp, &wtime, sizeof wtime) ?
@@ -104,12 +104,12 @@ static int rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
                 local_irq_save(flags);
                 rtc->ctrl     = RTC_WRITE;
 
-                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);
 
                 rtc->ctrl     = 0;
                 local_irq_restore(flags);