[SPARC]: Merge asm-sparc{,64}/current.h

[linux-2.6-omap-h63xx.git] / include / asm-sparc64 / mostek.h

diff --git a/include/asm-sparc64/mostek.h b/include/asm-sparc64/mostek.h
index 1f9b1356a48e9e84261676e449597ba05ecaaf88..c5652de2ace203ae53c2fec604db79478bfae64a 100644 (file)
--- a/include/asm-sparc64/mostek.h
+++ b/include/asm-sparc64/mostek.h
@@ -1,7 +1,6 @@
-/* $Id: mostek.h,v 1.4 2001/01/11 15:07:09 davem Exp $
- * mostek.h:  Describes the various Mostek time of day clock registers.
+/* mostek.h:  Describes the various Mostek time of day clock registers.
  *
- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
+ * Copyright (C) 1995 David S. Miller (davem@davemloft.net)
  * Copyright (C) 1996 Thomas K. Dyas (tdyas@eden.rutgers.edu)
  */
 
@@ -38,7 +37,7 @@
  *
  * We now deal with physical addresses for I/O to the chip. -DaveM
  */
-static __inline__ u8 mostek_read(void * __iomem addr)
+static inline u8 mostek_read(void __iomem *addr)
 {
        u8 ret;
 
@@ -48,7 +47,7 @@ static __inline__ u8 mostek_read(void * __iomem addr)
        return ret;
 }
 
-static __inline__ void mostek_write(void * __iomem addr, u8 val)
+static inline void mostek_write(void __iomem *addr, u8 val)
 {
        __asm__ __volatile__("stba      %0, [%1] %2"
                             : /* no outputs */
@@ -67,7 +66,7 @@ static __inline__ void mostek_write(void * __iomem addr, u8 val)
 #define MOSTEK_YEAR            0x07ffUL
 
 extern spinlock_t mostek_lock;
-extern void *__iomem mstk48t02_regs;
+extern void __iomem *mstk48t02_regs;
 
 /* Control register values. */
 #define        MSTK_CREG_WRITE 0x80    /* Must set this before placing values. */
@@ -89,7 +88,7 @@ extern void *__iomem mstk48t02_regs;
 #define        MSTK_DOW_MASK   0x07
 #define        MSTK_DOM_MASK   0x3f
 #define        MSTK_MONTH_MASK 0x1f
-#define        MSTK_YEAR_MASK  0xff
+#define        MSTK_YEAR_MASK  0xffU
 
 /* Binary coded decimal conversion macros. */
 #define MSTK_REGVAL_TO_DECIMAL(x)  (((x) & 0x0F) + 0x0A * ((x) >> 0x04))