7 files changed, 83 insertions, 88 deletions

diff --git a/arch/parisc/include/asm/cacheflush.h b/arch/parisc/include/asm/cacheflush.h
index 7bd69bd43a01..19c9c3c5f267 100644
--- a/arch/parisc/include/asm/cacheflush.h
+++ b/arch/parisc/include/asm/cacheflush.h
@@ -27,8 +27,6 @@ void flush_user_dcache_range_asm(unsigned long, unsigned long);
 void flush_kernel_dcache_range_asm(unsigned long, unsigned long);
 void flush_kernel_dcache_page_asm(void *);
 void flush_kernel_icache_page(void *);
-void flush_user_dcache_range(unsigned long, unsigned long);
-void flush_user_icache_range(unsigned long, unsigned long);
 
 /* Cache flush operations */
 
diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
index 9a2aee1b90fc..fb4382c28259 100644
--- a/arch/parisc/include/asm/uaccess.h
+++ b/arch/parisc/include/asm/uaccess.h
@@ -32,11 +32,7 @@
  * that put_user is the same as __put_user, etc.
  */
 
-static inline long access_ok(int type, const void __user * addr,
-                unsigned long size)
-{
-        return 1;
-}
+#define access_ok(type, uaddr, size) (1)
 
 #define put_user __put_user
 #define get_user __get_user
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c
index 7820b864de1a..0dc72d5de861 100644
--- a/arch/parisc/kernel/cache.c
+++ b/arch/parisc/kernel/cache.c
@@ -574,24 +574,6 @@ void flush_cache_mm(struct mm_struct *mm)
         }
 }
 
-void
-flush_user_dcache_range(unsigned long start, unsigned long end)
-{
-        if ((end - start) < parisc_cache_flush_threshold)
-                flush_user_dcache_range_asm(start,end);
-        else
-                flush_data_cache();
-}
-
-void
-flush_user_icache_range(unsigned long start, unsigned long end)
-{
-        if ((end - start) < parisc_cache_flush_threshold)
-                flush_user_icache_range_asm(start,end);
-        else
-                flush_instruction_cache();
-}
-
 void flush_cache_range(struct vm_area_struct *vma,
                 unsigned long start, unsigned long end)
 {
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 9e03296641d7..26f12f45b4bb 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -233,6 +233,7 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs,
         struct rt_sigframe __user *frame;
         unsigned long rp, usp;
         unsigned long haddr, sigframe_size;
+        unsigned long start, end;
         int err = 0;
 #ifdef CONFIG_64BIT
         struct compat_rt_sigframe __user * compat_frame;
@@ -300,10 +301,10 @@ setup_rt_frame(struct ksignal *ksig, sigset_t *set, struct pt_regs *regs,
         }
 #endif
 
-        flush_user_dcache_range((unsigned long) &frame->tramp[0],
-                           (unsigned long) &frame->tramp[TRAMP_SIZE]);
-        flush_user_icache_range((unsigned long) &frame->tramp[0],
-                           (unsigned long) &frame->tramp[TRAMP_SIZE]);
+        start = (unsigned long) &frame->tramp[0];
+        end = (unsigned long) &frame->tramp[TRAMP_SIZE];
+        flush_user_dcache_range_asm(start, end);
+        flush_user_icache_range_asm(start, end);
 
         /* TRAMP Words 0-4, Length 5 = SIGRESTARTBLOCK_TRAMP
          * TRAMP Words 5-9, Length 4 = SIGRETURN_TRAMP
@@ -549,8 +550,8 @@ insert_restart_trampoline(struct pt_regs *regs)
                 WARN_ON(err);
 
                 /* flush data/instruction cache for new insns */
-                flush_user_dcache_range(start, end);
-                flush_user_icache_range(start, end);
+                flush_user_dcache_range_asm(start, end);
+                flush_user_icache_range_asm(start, end);
 
                 regs->gr[31] = regs->gr[30] + 8;
                 return;
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index c3cac4ddfe9c..deab89a8915a 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -239,8 +239,8 @@ show_signal_msg(struct pt_regs *regs, unsigned long code,
                 vma ? ',':'\n');
 
         if (vma)
-                pr_warn(KERN_CONT " vm_start = 0x%08lx, vm_end = 0x%08lx\n",
-                                vma->vm_start, vma->vm_end);
+                pr_cont(" vm_start = 0x%08lx, vm_end = 0x%08lx\n",
+                        vma->vm_start, vma->vm_end);
 
         show_regs(regs);
 }
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index aeb073b5fe16..e32ca2ef9e54 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1539,7 +1539,7 @@ static int __init ccio_probe(struct parisc_device *dev)
         ioc = kzalloc(sizeof(struct ioc), GFP_KERNEL);
         if (ioc == NULL) {
                 printk(KERN_ERR MODULE_NAME ": memory allocation failure\n");
-                return 1;
+                return -ENOMEM;
         }
 
         ioc->name = dev->id.hversion == U2_IOA_RUNWAY ? "U2" : "UTurn";
@@ -1554,6 +1554,10 @@ static int __init ccio_probe(struct parisc_device *dev)
 
         ioc->hw_path = dev->hw_path;
         ioc->ioc_regs = ioremap_nocache(dev->hpa.start, 4096);
+        if (!ioc->ioc_regs) {
+                kfree(ioc);
+                return -ENOMEM;
+        }
         ccio_ioc_init(ioc);
         ccio_init_resources(ioc);
         hppa_dma_ops = &ccio_ops;
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index 103095bbe8c0..7e2f6d5a6aaf 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -14,16 +14,16 @@
  * Wax ASIC also includes a PS/2 and RS-232 controller, but those are
  * dealt with elsewhere; this file is concerned only with the EISA portions
  * of Wax.
- * 
- * 
+ *
+ *
  * HINT:
  * -----
  * To allow an ISA card to work properly in the EISA slot you need to
- * set an edge trigger level. This may be done on the palo command line 
- * by adding the kernel parameter "eisa_irq_edge=n,n2,[...]]", with 
+ * set an edge trigger level. This may be done on the palo command line
+ * by adding the kernel parameter "eisa_irq_edge=n,n2,[...]]", with
  * n and n2 as the irq levels you want to use.
- * 
- * Example: "eisa_irq_edge=10,11" allows ISA cards to operate at 
+ *
+ * Example: "eisa_irq_edge=10,11" allows ISA cards to operate at
  * irq levels 10 and 11.
  */
 
@@ -46,9 +46,9 @@
 #include <asm/eisa_eeprom.h>
 
 #if 0
-#define EISA_DBG(msg, arg... ) printk(KERN_DEBUG "eisa: " msg , ## arg )
+#define EISA_DBG(msg, arg...) printk(KERN_DEBUG "eisa: " msg, ## arg)
 #else
-#define EISA_DBG(msg, arg... )  
+#define EISA_DBG(msg, arg...)
 #endif
 
 #define SNAKES_EEPROM_BASE_ADDR 0xF0810400
@@ -108,7 +108,7 @@ void eisa_out8(unsigned char data, unsigned short port)
 
 void eisa_out16(unsigned short data, unsigned short port)
 {
-        if (EISA_bus)   
+        if (EISA_bus)
                 gsc_writew(cpu_to_le16(data), eisa_permute(port));
 }
 
@@ -135,9 +135,9 @@ static int master_mask;
 static int slave_mask;
 
 /* the trig level can be set with the
- * eisa_irq_edge=n,n,n commandline parameter 
- * We should really read this from the EEPROM 
- * in the furure. 
+ * eisa_irq_edge=n,n,n commandline parameter
+ * We should really read this from the EEPROM
+ * in the furure.
  */
 /* irq 13,8,2,1,0 must be edge */
 static unsigned int eisa_irq_level __read_mostly; /* default to edge triggered */
@@ -170,7 +170,7 @@ static void eisa_unmask_irq(struct irq_data *d)
         unsigned int irq = d->irq;
         unsigned long flags;
         EISA_DBG("enable irq %d\n", irq);
-                
+
         spin_lock_irqsave(&eisa_irq_lock, flags);
         if (irq & 8) {
                 slave_mask &= ~(1 << (irq&7));
@@ -194,7 +194,7 @@ static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)
 {
         int irq = gsc_readb(0xfc01f000); /* EISA supports 16 irqs */
         unsigned long flags;
-        
+
         spin_lock_irqsave(&eisa_irq_lock, flags);
         /* read IRR command */
         eisa_out8(0x0a, 0x20);
@@ -202,31 +202,31 @@ static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)
 
         EISA_DBG("irq IAR %02x 8259-1 irr %02x 8259-2 irr %02x\n",
                    irq, eisa_in8(0x20), eisa_in8(0xa0));
-   
+
         /* read ISR command */
         eisa_out8(0x0a, 0x20);
         eisa_out8(0x0a, 0xa0);
         EISA_DBG("irq 8259-1 isr %02x imr %02x 8259-2 isr %02x imr %02x\n",
                  eisa_in8(0x20), eisa_in8(0x21), eisa_in8(0xa0), eisa_in8(0xa1));
-        
+
         irq &= 0xf;
-        
+
         /* mask irq and write eoi */
         if (irq & 8) {
                 slave_mask |= (1 << (irq&7));
                 eisa_out8(slave_mask, 0xa1);
                 eisa_out8(0x60 | (irq&7),0xa0);/* 'Specific EOI' to slave */
-                eisa_out8(0x62,0x20);   /* 'Specific EOI' to master-IRQ2 */
-                
+                eisa_out8(0x62, 0x20);  /* 'Specific EOI' to master-IRQ2 */
+
         } else {
                 master_mask |= (1 << (irq&7));
                 eisa_out8(master_mask, 0x21);
-                eisa_out8(0x60|irq,0x20);       /* 'Specific EOI' to master */
+                eisa_out8(0x60|irq, 0x20);      /* 'Specific EOI' to master */
         }
         spin_unlock_irqrestore(&eisa_irq_lock, flags);
 
         generic_handle_irq(irq);
-   
+
         spin_lock_irqsave(&eisa_irq_lock, flags);
         /* unmask */
         if (irq & 8) {
@@ -254,44 +254,44 @@ static struct irqaction irq2_action = {
 static void init_eisa_pic(void)
 {
         unsigned long flags;
-        
+
         spin_lock_irqsave(&eisa_irq_lock, flags);
 
         eisa_out8(0xff, 0x21); /* mask during init */
         eisa_out8(0xff, 0xa1); /* mask during init */
-        
+
         /* master pic */
-        eisa_out8(0x11,0x20); /* ICW1 */   
-        eisa_out8(0x00,0x21); /* ICW2 */   
-        eisa_out8(0x04,0x21); /* ICW3 */   
-        eisa_out8(0x01,0x21); /* ICW4 */   
-        eisa_out8(0x40,0x20); /* OCW2 */   
-        
+        eisa_out8(0x11, 0x20); /* ICW1 */
+        eisa_out8(0x00, 0x21); /* ICW2 */
+        eisa_out8(0x04, 0x21); /* ICW3 */
+        eisa_out8(0x01, 0x21); /* ICW4 */
+        eisa_out8(0x40, 0x20); /* OCW2 */
+
         /* slave pic */
-        eisa_out8(0x11,0xa0); /* ICW1 */   
-        eisa_out8(0x08,0xa1); /* ICW2 */   
-        eisa_out8(0x02,0xa1); /* ICW3 */   
-        eisa_out8(0x01,0xa1); /* ICW4 */   
-        eisa_out8(0x40,0xa0); /* OCW2 */   
-        
+        eisa_out8(0x11, 0xa0); /* ICW1 */
+        eisa_out8(0x08, 0xa1); /* ICW2 */
+        eisa_out8(0x02, 0xa1); /* ICW3 */
+        eisa_out8(0x01, 0xa1); /* ICW4 */
+        eisa_out8(0x40, 0xa0); /* OCW2 */
+
         udelay(100);
-        
-        slave_mask = 0xff; 
-        master_mask = 0xfb; 
+
+        slave_mask = 0xff;
+        master_mask = 0xfb;
         eisa_out8(slave_mask, 0xa1); /* OCW1 */
         eisa_out8(master_mask, 0x21); /* OCW1 */
-        
+
         /* setup trig level */
         EISA_DBG("EISA edge/level %04x\n", eisa_irq_level);
-        
+
         eisa_out8(eisa_irq_level&0xff, 0x4d0); /* Set all irq's to edge  */
-        eisa_out8((eisa_irq_level >> 8) & 0xff, 0x4d1); 
-        
+        eisa_out8((eisa_irq_level >> 8) & 0xff, 0x4d1);
+
         EISA_DBG("pic0 mask %02x\n", eisa_in8(0x21));
         EISA_DBG("pic1 mask %02x\n", eisa_in8(0xa1));
         EISA_DBG("pic0 edge/level %02x\n", eisa_in8(0x4d0));
         EISA_DBG("pic1 edge/level %02x\n", eisa_in8(0x4d1));
-        
+
         spin_unlock_irqrestore(&eisa_irq_lock, flags);
 }
 
@@ -305,7 +305,7 @@ static int __init eisa_probe(struct parisc_device *dev)
 
         char *name = is_mongoose(dev) ? "Mongoose" : "Wax";
 
-        printk(KERN_INFO "%s EISA Adapter found at 0x%08lx\n", 
+        printk(KERN_INFO "%s EISA Adapter found at 0x%08lx\n",
                 name, (unsigned long)dev->hpa.start);
 
         eisa_dev.hba.dev = dev;
@@ -334,16 +334,16 @@ static int __init eisa_probe(struct parisc_device *dev)
         result = request_irq(dev->irq, eisa_irq, IRQF_SHARED, "EISA", &eisa_dev);
         if (result) {
                 printk(KERN_ERR "EISA: request_irq failed!\n");
-                return result;
+                goto error_release;
         }
-        
+
         /* Reserve IRQ2 */
         setup_irq(2, &irq2_action);
         for (i = 0; i < 16; i++) {
                 irq_set_chip_and_handler(i, &eisa_interrupt_type,
                                          handle_simple_irq);
         }
-        
+
         EISA_bus = 1;
 
         if (dev->num_addrs) {
@@ -358,6 +358,11 @@ static int __init eisa_probe(struct parisc_device *dev)
                 }
         }
         eisa_eeprom_addr = ioremap_nocache(eisa_dev.eeprom_addr, HPEE_MAX_LENGTH);
+        if (!eisa_eeprom_addr) {
+                result = -ENOMEM;
+                printk(KERN_ERR "EISA: ioremap_nocache failed!\n");
+                goto error_free_irq;
+        }
         result = eisa_enumerator(eisa_dev.eeprom_addr, &eisa_dev.hba.io_space,
                         &eisa_dev.hba.lmmio_space);
         init_eisa_pic();
@@ -372,11 +377,20 @@ static int __init eisa_probe(struct parisc_device *dev)
                 eisa_dev.root.dma_mask = 0xffffffff; /* wild guess */
                 if (eisa_root_register (&eisa_dev.root)) {
                         printk(KERN_ERR "EISA: Failed to register EISA root\n");
-                        return -1;
+                        result = -ENOMEM;
+                        goto error_iounmap;
                 }
         }
-        
+
         return 0;
+
+error_iounmap:
+        iounmap(eisa_eeprom_addr);
+error_free_irq:
+        free_irq(dev->irq, &eisa_dev);
+error_release:
+        release_resource(&eisa_dev.hba.io_space);
+        return result;
 }
 
 static const struct parisc_device_id eisa_tbl[] = {
@@ -404,7 +418,7 @@ void eisa_make_irq_level(int num)
 {
         if (eisa_irq_configured& (1<<num)) {
                 printk(KERN_WARNING
-                       "IRQ %d polarity configured twice (last to level)\n", 
+                       "IRQ %d polarity configured twice (last to level)\n",
                        num);
         }
         eisa_irq_level |= (1<<num); /* set the corresponding bit */
@@ -414,7 +428,7 @@ void eisa_make_irq_level(int num)
 void eisa_make_irq_edge(int num)
 {
         if (eisa_irq_configured& (1<<num)) {
-                printk(KERN_WARNING 
+                printk(KERN_WARNING
                        "IRQ %d polarity configured twice (last to edge)\n",
                        num);
         }
@@ -430,18 +444,18 @@ static int __init eisa_irq_setup(char *str)
         EISA_DBG("IRQ setup\n");
         while (cur != NULL) {
                 char *pe;
-                
+
                 val = (int) simple_strtoul(cur, &pe, 0);
                 if (val > 15 || val < 0) {
                         printk(KERN_ERR "eisa: EISA irq value are 0-15\n");
                         continue;
                 }
-                if (val == 2) { 
+                if (val == 2) {
                         val = 9;
                 }
                 eisa_make_irq_edge(val); /* clear the corresponding bit */
                 EISA_DBG("setting IRQ %d to edge-triggered mode\n", val);
-                
+
                 if ((cur = strchr(cur, ','))) {
                         cur++;
                 } else {