10 files changed, 54 insertions, 38 deletions

diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 5d610cbcfe80..0f0e0b919ef4 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1134,7 +1134,7 @@ static const struct file_operations ccio_proc_bitmap_fops = {
         .llseek = seq_lseek,
         .release = single_release,
 };
-#endif
+#endif /* CONFIG_PROC_FS */
 
 /**
  * ccio_find_ioc - Find the ioc in the ioc_list
@@ -1568,14 +1568,15 @@ static int __init ccio_probe(struct parisc_device *dev)
         /* if this fails, no I/O cards will work, so may as well bug */
         BUG_ON(dev->dev.platform_data == NULL);
         HBA_DATA(dev->dev.platform_data)->iommu = ioc;
-        
+
+#ifdef CONFIG_PROC_FS
         if (ioc_count == 0) {
                 proc_create(MODULE_NAME, 0, proc_runway_root,
                             &ccio_proc_info_fops);
                 proc_create(MODULE_NAME"-bitmap", 0, proc_runway_root,
                             &ccio_proc_bitmap_fops);
         }
-
+#endif
         ioc_count++;
 
         parisc_has_iommu();
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c
index 52ae0b1d470c..c590974e9815 100644
--- a/drivers/parisc/dino.c
+++ b/drivers/parisc/dino.c
@@ -353,7 +353,7 @@ static unsigned int dino_startup_irq(unsigned int irq)
         return 0;
 }
 
-static struct hw_interrupt_type dino_interrupt_type = {
+static struct irq_chip dino_interrupt_type = {
         .typename       = "GSC-PCI",
         .startup        = dino_startup_irq,
         .shutdown       = dino_disable_irq,
@@ -1019,22 +1019,22 @@ static int __init dino_probe(struct parisc_device *dev)
         ** It's not used to avoid chicken/egg problems
         ** with configuration accessor functions.
         */
-        bus = pci_scan_bus_parented(&dev->dev, dino_current_bus,
-                                    &dino_cfg_ops, NULL);
+        dino_dev->hba.hba_bus = bus = pci_scan_bus_parented(&dev->dev,
+                         dino_current_bus, &dino_cfg_ops, NULL);
+
         if(bus) {
-                pci_bus_add_devices(bus);
                 /* This code *depends* on scanning being single threaded
                  * if it isn't, this global bus number count will fail
                  */
                 dino_current_bus = bus->subordinate + 1;
                 pci_bus_assign_resources(bus);
+                pci_bus_add_devices(bus);
         } else {
-                printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n",
+                printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (duplicate bus number %d?)\n",
                        dev_name(&dev->dev), dino_current_bus);
                 /* increment the bus number in case of duplicates */
                 dino_current_bus++;
         }
-        dino_dev->hba.hba_bus = bus;
         return 0;
 }
 
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index 5b89f404e668..51220749cb65 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -188,7 +188,7 @@ static unsigned int eisa_startup_irq(unsigned int irq)
         return 0;
 }
 
-static struct hw_interrupt_type eisa_interrupt_type = {
+static struct irq_chip eisa_interrupt_type = {
         .typename =     "EISA",
         .startup =      eisa_startup_irq,
         .shutdown =     eisa_disable_irq,
diff --git a/drivers/parisc/eisa_enumerator.c b/drivers/parisc/eisa_enumerator.c
index c709ecc2b7f7..0be1d50645ab 100644
--- a/drivers/parisc/eisa_enumerator.c
+++ b/drivers/parisc/eisa_enumerator.c
@@ -101,7 +101,7 @@ static int configure_memory(const unsigned char *buf,
                         printk("memory %lx-%lx ", (unsigned long)res->start, (unsigned long)res->end);
                         result = request_resource(mem_parent, res);
                         if (result < 0) {
-                                printk("\n" KERN_ERR "EISA Enumerator: failed to claim EISA Bus address space!\n");
+                                printk(KERN_ERR "EISA Enumerator: failed to claim EISA Bus address space!\n");
                                 return result;
                         }
                 }
@@ -191,7 +191,7 @@ static int configure_port(const unsigned char *buf, struct resource *io_parent,
                         printk("ioports %lx-%lx ", (unsigned long)res->start, (unsigned long)res->end);
                         result = request_resource(io_parent, res);
                         if (result < 0) {
-                                printk("\n" KERN_ERR "EISA Enumerator: failed to claim EISA Bus address space!\n");
+                                printk(KERN_ERR "EISA Enumerator: failed to claim EISA Bus address space!\n");
                                 return result;
                         }
                 }
@@ -224,7 +224,7 @@ static int configure_port_init(const unsigned char *buf)
                  case HPEE_PORT_INIT_WIDTH_BYTE:
                         s=1;
                         if (c & HPEE_PORT_INIT_MASK) {
-                                printk("\n" KERN_WARNING "port_init: unverified mask attribute\n");
+                                printk(KERN_WARNING "port_init: unverified mask attribute\n");
                                 outb((inb(get_16(buf+len+1) & 
                                           get_8(buf+len+3)) | 
                                       get_8(buf+len+4)), get_16(buf+len+1));
@@ -249,7 +249,7 @@ static int configure_port_init(const unsigned char *buf)
                  case HPEE_PORT_INIT_WIDTH_DWORD:
                         s=4;
                         if (c & HPEE_PORT_INIT_MASK) {
-                                printk("\n" KERN_WARNING "port_init: unverified mask attribute\n");
+                                printk(KERN_WARNING "port_init: unverified mask attribute\n");
                                 outl((inl(get_16(buf+len+1) &
                                           get_32(buf+len+3)) |
                                       get_32(buf+len+7)), get_16(buf+len+1));
@@ -259,7 +259,7 @@ static int configure_port_init(const unsigned char *buf)
 
                         break;
                  default:
-                        printk("\n" KERN_ERR "Invalid port init word %02x\n", c);
+                        printk(KERN_ERR "Invalid port init word %02x\n", c);
                         return 0;
                 }
                 
@@ -297,7 +297,7 @@ static int configure_type_string(const unsigned char *buf)
         /* just skip past the type field */
         len = get_8(buf);
         if (len > 80) {
-                printk("\n" KERN_ERR "eisa_enumerator: type info field too long (%d, max is 80)\n", len);
+                printk(KERN_ERR "eisa_enumerator: type info field too long (%d, max is 80)\n", len);
         }
         
         return 1+len;
@@ -398,7 +398,7 @@ static int parse_slot_config(int slot,
                 }
                 
                 if (p0 + function_len < pos) {
-                        printk("\n" KERN_ERR "eisa_enumerator: function %d length mis-match "
+                        printk(KERN_ERR "eisa_enumerator: function %d length mis-match "
                                "got %d, expected %d\n",
                                num_func, pos-p0, function_len);
                         res=-1;
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c
index d33632917696..647adc9f85ad 100644
--- a/drivers/parisc/gsc.c
+++ b/drivers/parisc/gsc.c
@@ -148,7 +148,7 @@ static unsigned int gsc_asic_startup_irq(unsigned int irq)
         return 0;
 }
 
-static struct hw_interrupt_type gsc_asic_interrupt_type = {
+static struct irq_chip gsc_asic_interrupt_type = {
         .typename =     "GSC-ASIC",
         .startup =      gsc_asic_startup_irq,
         .shutdown =     gsc_asic_disable_irq,
@@ -158,7 +158,7 @@ static struct hw_interrupt_type gsc_asic_interrupt_type = {
         .end =          no_end_irq,
 };
 
-int gsc_assign_irq(struct hw_interrupt_type *type, void *data)
+int gsc_assign_irq(struct irq_chip *type, void *data)
 {
         static int irq = GSC_IRQ_BASE;
         struct irq_desc *desc;
diff --git a/drivers/parisc/gsc.h b/drivers/parisc/gsc.h
index 762a1babad60..b9d7bfb68e24 100644
--- a/drivers/parisc/gsc.h
+++ b/drivers/parisc/gsc.h
@@ -38,7 +38,7 @@ struct gsc_asic {
 int gsc_common_setup(struct parisc_device *parent, struct gsc_asic *gsc_asic);
 int gsc_alloc_irq(struct gsc_irq *dev);                 /* dev needs an irq */
 int gsc_claim_irq(struct gsc_irq *dev, int irq);        /* dev needs this irq */
-int gsc_assign_irq(struct hw_interrupt_type *type, void *data);
+int gsc_assign_irq(struct irq_chip *type, void *data);
 int gsc_find_local_irq(unsigned int irq, int *global_irq, int limit);
 void gsc_fixup_irqs(struct parisc_device *parent, void *ctrl,
                 void (*choose)(struct parisc_device *child, void *ctrl));
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c
index 4a9cc92d4d18..88e333553212 100644
--- a/drivers/parisc/iosapic.c
+++ b/drivers/parisc/iosapic.c
@@ -729,7 +729,7 @@ static int iosapic_set_affinity_irq(unsigned int irq,
 }
 #endif
 
-static struct hw_interrupt_type iosapic_interrupt_type = {
+static struct irq_chip iosapic_interrupt_type = {
         .typename =     "IO-SAPIC-level",
         .startup =      iosapic_startup_irq,
         .shutdown =     iosapic_disable_irq,
diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c
index 59fbbf128365..ede614616f8e 100644
--- a/drivers/parisc/lba_pci.c
+++ b/drivers/parisc/lba_pci.c
@@ -980,28 +980,38 @@ static void
 lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)
 {
         unsigned long bytecnt;
-        pdc_pat_cell_mod_maddr_block_t pa_pdc_cell;     /* PA_VIEW */
-        pdc_pat_cell_mod_maddr_block_t io_pdc_cell;     /* IO_VIEW */
         long io_count;
         long status;    /* PDC return status */
         long pa_count;
+        pdc_pat_cell_mod_maddr_block_t *pa_pdc_cell;    /* PA_VIEW */
+        pdc_pat_cell_mod_maddr_block_t *io_pdc_cell;    /* IO_VIEW */
         int i;
 
+        pa_pdc_cell = kzalloc(sizeof(pdc_pat_cell_mod_maddr_block_t), GFP_KERNEL);
+        if (!pa_pdc_cell)
+                return;
+
+        io_pdc_cell = kzalloc(sizeof(pdc_pat_cell_mod_maddr_block_t), GFP_KERNEL);
+        if (!pa_pdc_cell) {
+                kfree(pa_pdc_cell);
+                return;
+        }
+
         /* return cell module (IO view) */
         status = pdc_pat_cell_module(&bytecnt, pa_dev->pcell_loc, pa_dev->mod_index,
-                                PA_VIEW, & pa_pdc_cell);
-        pa_count = pa_pdc_cell.mod[1];
+                                PA_VIEW, pa_pdc_cell);
+        pa_count = pa_pdc_cell->mod[1];
 
         status |= pdc_pat_cell_module(&bytecnt, pa_dev->pcell_loc, pa_dev->mod_index,
-                                IO_VIEW, &io_pdc_cell);
-        io_count = io_pdc_cell.mod[1];
+                                IO_VIEW, io_pdc_cell);
+        io_count = io_pdc_cell->mod[1];
 
         /* We've already done this once for device discovery...*/
         if (status != PDC_OK) {
                 panic("pdc_pat_cell_module() call failed for LBA!\n");
         }
 
-        if (PAT_GET_ENTITY(pa_pdc_cell.mod_info) != PAT_ENTITY_LBA) {
+        if (PAT_GET_ENTITY(pa_pdc_cell->mod_info) != PAT_ENTITY_LBA) {
                 panic("pdc_pat_cell_module() entity returned != PAT_ENTITY_LBA!\n");
         }
 
@@ -1016,8 +1026,8 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)
                 } *p, *io;
                 struct resource *r;
 
-                p = (void *) &(pa_pdc_cell.mod[2+i*3]);
-                io = (void *) &(io_pdc_cell.mod[2+i*3]);
+                p = (void *) &(pa_pdc_cell->mod[2+i*3]);
+                io = (void *) &(io_pdc_cell->mod[2+i*3]);
 
                 /* Convert the PAT range data to PCI "struct resource" */
                 switch(p->type & 0xff) {
@@ -1096,6 +1106,9 @@ lba_pat_resources(struct parisc_device *pa_dev, struct lba_device *lba_dev)
                         break;
                 }
         }
+
+        kfree(pa_pdc_cell);
+        kfree(io_pdc_cell);
 }
 #else
 /* keep compiler from complaining about missing declarations */
@@ -1509,10 +1522,6 @@ lba_driver_probe(struct parisc_device *dev)
         lba_bus = lba_dev->hba.hba_bus =
                 pci_scan_bus_parented(&dev->dev, lba_dev->hba.bus_num.start,
                                 cfg_ops, NULL);
-        if (lba_bus) {
-                lba_next_bus = lba_bus->subordinate + 1;
-                pci_bus_add_devices(lba_bus);
-        }
 
         /* This is in lieu of calling pci_assign_unassigned_resources() */
         if (is_pdc_pat()) {
@@ -1533,7 +1542,6 @@ lba_driver_probe(struct parisc_device *dev)
         }
         pci_enable_bridges(lba_bus);
 
-
         /*
         ** Once PCI register ops has walked the bus, access to config
         ** space is restricted. Avoids master aborts on config cycles.
@@ -1543,6 +1551,11 @@ lba_driver_probe(struct parisc_device *dev)
                 lba_dev->flags |= LBA_FLAG_SKIP_PROBE;
         }
 
+        if (lba_bus) {
+                lba_next_bus = lba_bus->subordinate + 1;
+                pci_bus_add_devices(lba_bus);
+        }
+
         /* Whew! Finally done! Tell services we got this one covered. */
         return 0;
 }
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index d46dd57450ac..123d8fe3427d 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -2057,6 +2057,7 @@ void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r)
                 r->start = (base & ~1UL) | PCI_F_EXTEND;
                 size = ~ READ_REG32(reg + LMMIO_DIRECT0_MASK);
                 r->end = r->start + size;
+                r->flags = IORESOURCE_MEM;
         }
 }
 
@@ -2093,4 +2094,5 @@ void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r )
         size = (~READ_REG32(sba->sba_hpa + LMMIO_DIST_MASK)) / ROPES_PER_IOC;
         r->start += rope * (size + 1);  /* adjust base for this rope */
         r->end = r->start + size;
+        r->flags = IORESOURCE_MEM;
 }
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 33e5ade774ca..675f04e6597a 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -325,7 +325,7 @@ static unsigned int superio_startup_irq(unsigned int irq)
         return 0;
 }
 
-static struct hw_interrupt_type superio_interrupt_type = {
+static struct irq_chip superio_interrupt_type = {
         .typename =     SUPERIO,
         .startup =      superio_startup_irq,
         .shutdown =     superio_disable_irq,
@@ -434,8 +434,8 @@ static void __init superio_parport_init(void)
                         0 /*base_hi*/,
                         PAR_IRQ, 
                         PARPORT_DMA_NONE /* dma */,
-                        NULL /*struct pci_dev* */),
-                        0 /* shared irq flags */ )
+                        NULL /*struct pci_dev* */,
+                        0 /* shared irq flags */))
 
                 printk(KERN_WARNING PFX "Probing parallel port failed.\n");
 #endif  /* CONFIG_PARPORT_PC */