m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

1 files changed, 15 insertions, 12 deletions

diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c
index e05994fd048c..eab7d342757e 100644
--- a/arch/m68k/mvme16x/config.c
+++ b/arch/m68k/mvme16x/config.c
@@ -30,6 +30,7 @@
 
 #include <asm/bootinfo.h>
 #include <asm/bootinfo-vme.h>
+#include <asm/byteorder.h>
 #include <asm/pgtable.h>
 #include <asm/setup.h>
 #include <asm/irq.h>
@@ -63,7 +64,8 @@ EXPORT_SYMBOL(mvme16x_config);
 
 int __init mvme16x_parse_bootinfo(const struct bi_record *bi)
 {
-        if (bi->tag == BI_VME_TYPE || bi->tag == BI_VME_BRDINFO)
+        uint16_t tag = be16_to_cpu(bi->tag);
+        if (tag == BI_VME_TYPE || tag == BI_VME_BRDINFO)
                 return 0;
         else
                 return 1;
@@ -88,15 +90,15 @@ static void mvme16x_get_model(char *model)
     suf[3] = '\0';
     suf[0] = suf[1] ? '-' : '\0';
 
-    sprintf(model, "Motorola MVME%x%s", p->brdno, suf);
+    sprintf(model, "Motorola MVME%x%s", be16_to_cpu(p->brdno), suf);
 }
 
 
 static void mvme16x_get_hardware_list(struct seq_file *m)
 {
-    p_bdid p = &mvme_bdid;
+    uint16_t brdno = be16_to_cpu(mvme_bdid.brdno);
 
-    if (p->brdno == 0x0162 || p->brdno == 0x0172)
+    if (brdno == 0x0162 || brdno == 0x0172)
     {
         unsigned char rev = *(unsigned char *)MVME162_VERSION_REG;
 
@@ -286,6 +288,7 @@ void __init config_mvme16x(void)
 {
     p_bdid p = &mvme_bdid;
     char id[40];
+    uint16_t brdno = be16_to_cpu(p->brdno);
 
     mach_max_dma_address = 0xffffffff;
     mach_sched_init      = mvme16x_sched_init;
@@ -307,18 +310,18 @@ void __init config_mvme16x(void)
     }
     /* Board type is only set by newer versions of vmelilo/tftplilo */
     if (vme_brdtype == 0)
-        vme_brdtype = p->brdno;
+        vme_brdtype = brdno;
 
     mvme16x_get_model(id);
     printk ("\nBRD_ID: %s   BUG %x.%x %02x/%02x/%02x\n", id, p->rev>>4,
                                         p->rev&0xf, p->yr, p->mth, p->day);
-    if (p->brdno == 0x0162 || p->brdno == 0x172)
+    if (brdno == 0x0162 || brdno == 0x172)
     {
         unsigned char rev = *(unsigned char *)MVME162_VERSION_REG;
 
         mvme16x_config = rev | MVME16x_CONFIG_GOT_SCCA;
 
-        printk ("MVME%x Hardware status:\n", p->brdno);
+        printk ("MVME%x Hardware status:\n", brdno);
         printk ("    CPU Type           68%s040\n",
                         rev & MVME16x_CONFIG_GOT_FPU ? "" : "LC");
         printk ("    CPU clock          %dMHz\n",
@@ -348,12 +351,12 @@ void __init config_mvme16x(void)
 
 static irqreturn_t mvme16x_abort_int (int irq, void *dev_id)
 {
-        p_bdid p = &mvme_bdid;
         unsigned long *new = (unsigned long *)vectors;
         unsigned long *old = (unsigned long *)0xffe00000;
         volatile unsigned char uc, *ucp;
+        uint16_t brdno = be16_to_cpu(mvme_bdid.brdno);
 
-        if (p->brdno == 0x0162 || p->brdno == 0x172)
+        if (brdno == 0x0162 || brdno == 0x172)
         {
                 ucp = (volatile unsigned char *)0xfff42043;
                 uc = *ucp | 8;
@@ -367,7 +370,7 @@ static irqreturn_t mvme16x_abort_int (int irq, void *dev_id)
         *(new+9) = *(old+9);            /* Trace */
         *(new+47) = *(old+47);          /* Trap #15 */
 
-        if (p->brdno == 0x0162 || p->brdno == 0x172)
+        if (brdno == 0x0162 || brdno == 0x172)
                 *(new+0x5e) = *(old+0x5e);      /* ABORT switch */
         else
                 *(new+0x6e) = *(old+0x6e);      /* ABORT switch */
@@ -382,7 +385,7 @@ static irqreturn_t mvme16x_timer_int (int irq, void *dev_id)
 
 void mvme16x_sched_init (irq_handler_t timer_routine)
 {
-    p_bdid p = &mvme_bdid;
+    uint16_t brdno = be16_to_cpu(mvme_bdid.brdno);
     int irq;
 
     tick_handler = timer_routine;
@@ -395,7 +398,7 @@ void mvme16x_sched_init (irq_handler_t timer_routine)
                                 "timer", mvme16x_timer_int))
         panic ("Couldn't register timer int");
 
-    if (p->brdno == 0x0162 || p->brdno == 0x172)
+    if (brdno == 0x0162 || brdno == 0x172)
         irq = MVME162_IRQ_ABORT;
     else
         irq = MVME167_IRQ_ABORT;