12 files changed, 44 insertions, 62 deletions

diff --git a/drivers/parisc/asp.c b/drivers/parisc/asp.c
index 9ca21098b146..6a1ab2512a53 100644
--- a/drivers/parisc/asp.c
+++ b/drivers/parisc/asp.c
@@ -15,7 +15,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
-#include <linux/slab.h>
 #include <linux/types.h>
 #include <asm/io.h>
 #include <asm/led.h>
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index a6b4a5a53d40..f511e70d454c 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -650,7 +650,7 @@ ccio_clear_io_tlb(struct ioc *ioc, dma_addr_t iovp, size_t byte_cnt)
  * Mark the I/O Pdir entries invalid and blow away the corresponding I/O
  * TLB entries.
  *
- * FIXME: at some threshhold it might be "cheaper" to just blow
+ * FIXME: at some threshold it might be "cheaper" to just blow
  *        away the entire I/O TLB instead of individual entries.
  *
  * FIXME: Uturn has 256 TLB entries. We don't need to purge every
diff --git a/drivers/parisc/ccio-rm-dma.c b/drivers/parisc/ccio-rm-dma.c
index 356b8357bccc..f78f6f1aef47 100644
--- a/drivers/parisc/ccio-rm-dma.c
+++ b/drivers/parisc/ccio-rm-dma.c
@@ -38,6 +38,7 @@
 #include <linux/mm.h>
 #include <linux/string.h>
 #include <linux/pci.h>
+#include <linux/gfp.h>
 
 #include <asm/uaccess.h>
 
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index d69bde6a2343..c542c7bb7454 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -354,7 +354,7 @@ static unsigned int dino_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip dino_interrupt_type = {
-        .typename       = "GSC-PCI",
+        .name           = "GSC-PCI",
         .startup        = dino_startup_irq,
         .shutdown       = dino_disable_irq,
         .enable         = dino_enable_irq, 
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index 51220749cb65..46f503fb7fc5 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -189,7 +189,7 @@ static unsigned int eisa_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip eisa_interrupt_type = {
-        .typename =     "EISA",
+        .name    =      "EISA",
         .startup =      eisa_startup_irq,
         .shutdown =     eisa_disable_irq,
         .enable =       eisa_enable_irq,
diff --git a/drivers/parisc/eisa_eeprom.c b/drivers/parisc/eisa_eeprom.c
index 8c0b26e9b98a..cce00ed81f37 100644
--- a/drivers/parisc/eisa_eeprom.c
+++ b/drivers/parisc/eisa_eeprom.c
@@ -75,17 +75,8 @@ static ssize_t eisa_eeprom_read(struct file * file,
         return ret;
 }
 
-static int eisa_eeprom_ioctl(struct inode *inode, struct file *file, 
-                           unsigned int cmd,
-                           unsigned long arg)
-{
-        return -ENOTTY;
-}
-
 static int eisa_eeprom_open(struct inode *inode, struct file *file)
 {
-        cycle_kernel_lock();
-
         if (file->f_mode & FMODE_WRITE)
                 return -EINVAL;
    
@@ -104,7 +95,6 @@ static const struct file_operations eisa_eeprom_fops = {
         .owner =        THIS_MODULE,
         .llseek =       eisa_eeprom_llseek,
         .read =         eisa_eeprom_read,
-        .ioctl =        eisa_eeprom_ioctl,
         .open =         eisa_eeprom_open,
         .release =      eisa_eeprom_release,
 };
diff --git a/drivers/parisc/eisa_enumerator.c b/drivers/parisc/eisa_enumerator.c
index 0be1d50645ab..caa153133754 100644
--- a/drivers/parisc/eisa_enumerator.c
+++ b/drivers/parisc/eisa_enumerator.c
@@ -460,7 +460,7 @@ static int init_slot(int slot, struct eeprom_eisa_slot_info *es)
                                slot, id_string);
                         
                         print_eisa_id(id_string, es->eisa_slot_id);
-                        printk(" expected %s \n", id_string);
+                        printk(" expected %s\n", id_string);
                 
                         return -1;      
                         
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index 647adc9f85ad..20a1bce1a031 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -19,7 +19,6 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
-#include <linux/slab.h>
 #include <linux/types.h>
 
 #include <asm/hardware.h>
@@ -149,7 +148,7 @@ static unsigned int gsc_asic_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip gsc_asic_interrupt_type = {
-        .typename =     "GSC-ASIC",
+        .name    =      "GSC-ASIC",
         .startup =      gsc_asic_startup_irq,
         .shutdown =     gsc_asic_disable_irq,
         .enable =       gsc_asic_enable_irq,
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 88e333553212..c76836727cae 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -730,7 +730,7 @@ static int iosapic_set_affinity_irq(unsigned int irq,
 #endif
 
 static struct irq_chip iosapic_interrupt_type = {
-        .typename =     "IO-SAPIC-level",
+        .name    =      "IO-SAPIC-level",
         .startup =      iosapic_startup_irq,
         .shutdown =     iosapic_disable_irq,
         .enable =       iosapic_enable_irq,
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c
index 9581d3619450..188bc8496a26 100644
--- a/drivers/parisc/led.c
+++ b/drivers/parisc/led.c
@@ -38,6 +38,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/reboot.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/ctype.h>
 #include <linux/blkdev.h>
 #include <linux/workqueue.h>
@@ -147,41 +148,34 @@ device_initcall(start_task);
 static void (*led_func_ptr) (unsigned char) __read_mostly;
 
 #ifdef CONFIG_PROC_FS
-static int led_proc_read(char *page, char **start, off_t off, int count, 
-        int *eof, void *data)
+static int led_proc_show(struct seq_file *m, void *v)
 {
-        char *out = page;
-        int len;
-
-        switch ((long)data)
+        switch ((long)m->private)
         {
         case LED_NOLCD:
-                out += sprintf(out, "Heartbeat: %d\n", led_heartbeat);
-                out += sprintf(out, "Disk IO: %d\n", led_diskio);
-                out += sprintf(out, "LAN Rx/Tx: %d\n", led_lanrxtx);
+                seq_printf(m, "Heartbeat: %d\n", led_heartbeat);
+                seq_printf(m, "Disk IO: %d\n", led_diskio);
+                seq_printf(m, "LAN Rx/Tx: %d\n", led_lanrxtx);
                 break;
         case LED_HASLCD:
-                out += sprintf(out, "%s\n", lcd_text);
+                seq_printf(m, "%s\n", lcd_text);
                 break;
         default:
-                *eof = 1;
                 return 0;
         }
+        return 0;
+}
 
-        len = out - page - off;
-        if (len < count) {
-                *eof = 1;
-                if (len <= 0) return 0;
-        } else {
-                len = count;
-        }
-        *start = page + off;
-        return len;
+static int led_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, led_proc_show, PDE(inode)->data);
 }
 
-static int led_proc_write(struct file *file, const char *buf, 
-        unsigned long count, void *data)
+
+static ssize_t led_proc_write(struct file *file, const char *buf,
+        size_t count, loff_t *pos)
 {
+        void *data = PDE(file->f_path.dentry->d_inode)->data;
         char *cur, lbuf[count + 1];
         int d;
 
@@ -234,6 +228,15 @@ parse_error:
         return -EINVAL;
 }
 
+static const struct file_operations led_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = led_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+        .write          = led_proc_write,
+};
+
 static int __init led_create_procfs(void)
 {
         struct proc_dir_entry *proc_pdc_root = NULL;
@@ -243,19 +246,15 @@ static int __init led_create_procfs(void)
 
         proc_pdc_root = proc_mkdir("pdc", 0);
         if (!proc_pdc_root) return -1;
-        ent = create_proc_entry("led", S_IFREG|S_IRUGO|S_IWUSR, proc_pdc_root);
+        ent = proc_create_data("led", S_IRUGO|S_IWUSR, proc_pdc_root,
+                                &led_proc_fops, (void *)LED_NOLCD); /* LED */
         if (!ent) return -1;
-        ent->data = (void *)LED_NOLCD; /* LED */
-        ent->read_proc = led_proc_read;
-        ent->write_proc = led_proc_write;
 
         if (led_type == LED_HASLCD)
         {
-                ent = create_proc_entry("lcd", S_IFREG|S_IRUGO|S_IWUSR, proc_pdc_root);
+                ent = proc_create_data("lcd", S_IRUGO|S_IWUSR, proc_pdc_root,
+                                        &led_proc_fops, (void *)LED_HASLCD); /* LCD */
                 if (!ent) return -1;
-                ent->data = (void *)LED_HASLCD; /* LCD */
-                ent->read_proc = led_proc_read;
-                ent->write_proc = led_proc_write;
         }
 
         return 0;
@@ -352,11 +351,9 @@ static __inline__ int led_get_net_activity(void)
 
         rx_total = tx_total = 0;
         
-        /* we are running as a workqueue task, so locking dev_base 
-         * for reading should be OK */
-        read_lock(&dev_base_lock);
+        /* we are running as a workqueue task, so we can use an RCU lookup */
         rcu_read_lock();
-        for_each_netdev(&init_net, dev) {
+        for_each_netdev_rcu(&init_net, dev) {
             const struct net_device_stats *stats;
             struct in_device *in_dev = __in_dev_get_rcu(dev);
             if (!in_dev || !in_dev->ifa_list)
@@ -368,7 +365,6 @@ static __inline__ int led_get_net_activity(void)
             tx_total += stats->tx_packets;
         }
         rcu_read_unlock();
-        read_unlock(&dev_base_lock);
 
         retval = 0;
 
diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 13a64bc081b6..1062b8ffe244 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj, struct attribute *attr,
         return ret;
 }
 
-static struct sysfs_ops pdcspath_attr_ops = {
+static const struct sysfs_ops pdcspath_attr_ops = {
         .show = pdcspath_attr_show,
         .store = pdcspath_attr_store,
 };
@@ -779,12 +779,9 @@ static ssize_t pdcs_auto_write(struct kobject *kobj,
         read_unlock(&pathentry->rw_lock);
         
         DPRINTK("%s: flags before: 0x%X\n", __func__, flags);
-                        
-        temp = in;
-        
-        while (*temp && isspace(*temp))
-                temp++;
-        
+
+        temp = skip_spaces(in);
+
         c = *temp++ - '0';
         if ((c != 0) && (c != 1))
                 goto parse_error;
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 675f04e6597a..f7806d81f1e0 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -169,7 +169,7 @@ superio_init(struct pci_dev *pcidev)
         /* ...then properly fixup the USB to point at suckyio PIC */
         sio->usb_pdev->irq = superio_fixup_irq(sio->usb_pdev);
 
-        printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i) \n",
+        printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i)\n",
                pci_name(pdev), pdev->irq);
 
         pci_read_config_dword (pdev, SIO_SP1BAR, &sio->sp1_base);
@@ -326,7 +326,7 @@ static unsigned int superio_startup_irq(unsigned int irq)
 }
 
 static struct irq_chip superio_interrupt_type = {
-        .typename =     SUPERIO,
+        .name    =      SUPERIO,
         .startup =      superio_startup_irq,
         .shutdown =     superio_disable_irq,
         .enable =       superio_enable_irq,