[IA64] minor sparse cleanups

Here are three more sparse-triggered fixes which didn't fit anywhere
else.  The first one gets rid of some quoting in palinfo.c which
sparse doesn't like.  This used to be necessary because GCC would
otherwise warn about an unknown trigraph.  That's not a problem
anymore since the kernel is now being compiled with -Wno-trigraphs.
The efirtc.c patch is mostly sparse-annotations but also cleans up
trailing whitespace.  Finally, the bitfields in rwlock_t are changed
to be explicitly "unsigned" to avoid a warning from sparse (it doesn't
like 1-bit signed bitfields in particular).

Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index afd753a7c7d71f1c76b2fa8a0476770dd067c881..25e7c834456402502edf40986c9572649a63c92b 100644 (file)
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -446,7 +446,7 @@ register_info(char *page)
                     "RSE stacked physical registers   : %ld\n"
                     "RSE load/store hints             : %ld (%s)\n",
                     phys_stacked, hints.ph_data,
-                    hints.ph_data < RSE_HINTS_COUNT ? rse_hints[hints.ph_data]: "(\?\?)");
+                    hints.ph_data < RSE_HINTS_COUNT ? rse_hints[hints.ph_data]: "(??)");
 
        if (ia64_pal_debug_info(&iregs, &dregs))
                return 0;

diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c
index 6d0b8129857ccf352315a0794d12e345685cc65b..1845739eea84809d3e09a74e5495e3ebc365738f 100644 (file)
--- a/drivers/char/efirtc.c
+++ b/drivers/char/efirtc.c
@@ -155,7 +155,7 @@ efi_rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
        efi_time_t      eft;
        efi_time_cap_t  cap;
        struct rtc_time wtime;
-       struct rtc_wkalrm *ewp;
+       struct rtc_wkalrm __user *ewp;
        unsigned char   enabled, pending;
 
        switch (cmd) {
@@ -189,13 +189,15 @@ efi_rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
                        convert_from_efi_time(&eft, &wtime);
 
-                       return copy_to_user((void *)arg, &wtime, sizeof (struct rtc_time)) ? - EFAULT : 0;
+                       return copy_to_user((void __user *)arg, &wtime,
+                                           sizeof (struct rtc_time)) ? - EFAULT : 0;
 
                case RTC_SET_TIME:
 
                        if (!capable(CAP_SYS_TIME)) return -EACCES;
 
-                       if (copy_from_user(&wtime, (struct rtc_time *)arg, sizeof(struct rtc_time)) )
+                       if (copy_from_user(&wtime, (struct rtc_time __user *)arg,
+                                          sizeof(struct rtc_time)) )
                                return -EFAULT;
 
                        convert_to_efi_time(&wtime, &eft);
@@ -212,19 +214,19 @@ efi_rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
                        if (!capable(CAP_SYS_TIME)) return -EACCES;
 
-                       ewp = (struct rtc_wkalrm *)arg;
+                       ewp = (struct rtc_wkalrm __user *)arg;
 
                        if (  get_user(enabled, &ewp->enabled)
                           || copy_from_user(&wtime, &ewp->time, sizeof(struct rtc_time)) )
                                return -EFAULT;
 
                        convert_to_efi_time(&wtime, &eft);
-                       
+
                        spin_lock_irqsave(&efi_rtc_lock, flags);
                        /*
                         * XXX Fixme:
                         * As of EFI 0.92 with the firmware I have on my
-                        * machine this call does not seem to work quite 
+                        * machine this call does not seem to work quite
                         * right
                         */
                        status = efi.set_wakeup_time((efi_bool_t)enabled, &eft);
@@ -243,14 +245,15 @@ efi_rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
 
                        if (status != EFI_SUCCESS) return -EINVAL;
 
-                       ewp = (struct rtc_wkalrm *)arg;
+                       ewp = (struct rtc_wkalrm __user *)arg;
 
                        if (  put_user(enabled, &ewp->enabled)
                           || put_user(pending, &ewp->pending)) return -EFAULT;
 
                        convert_from_efi_time(&eft, &wtime);
 
-                       return copy_to_user((void *)&ewp->time, &wtime, sizeof(struct rtc_time)) ? -EFAULT : 0;
+                       return copy_to_user(&ewp->time, &wtime,
+                                           sizeof(struct rtc_time)) ? -EFAULT : 0;
        }
        return -EINVAL;
 }

diff --git a/include/asm-ia64/spinlock.h b/include/asm-ia64/spinlock.h
index 40f939c5bb583434d9af094cdcdc6c1c4f63d096..a56a06665674769fb638475d31d238731fd9f482 100644 (file)
--- a/include/asm-ia64/spinlock.h
+++ b/include/asm-ia64/spinlock.h
@@ -114,8 +114,8 @@ do {                                                                                        \
 #define spin_unlock_wait(x)    do { barrier(); } while ((x)->lock)
 
 typedef struct {
-       volatile int read_counter       : 31;
-       volatile int write_lock         :  1;
+       volatile unsigned int read_counter      : 31;
+       volatile unsigned int write_lock        :  1;
 } rwlock_t;
 #define RW_LOCK_UNLOCKED (rwlock_t) { 0, 0 }