include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...

[safe/jmp/linux-2.6] / arch / powerpc / platforms / 82xx / pq2ads-pci-pic.c

diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
index 9876d7e..5a55d87 100644 (file)
--- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
+++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
@@ -17,6 +17,7 @@
 #include <linux/irq.h>
 #include <linux/types.h>
 #include <linux/bootmem.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -24,7 +25,7 @@
 
 #include "pq2.h"
 
-static DEFINE_SPINLOCK(pci_pic_lock);
+static DEFINE_RAW_SPINLOCK(pci_pic_lock);
 
 struct pq2ads_pci_pic {
        struct device_node *node;
@@ -45,12 +46,12 @@ static void pq2ads_pci_mask_irq(unsigned int virq)
 
        if (irq != -1) {
                unsigned long flags;
-               spin_lock_irqsave(&pci_pic_lock, flags);
+               raw_spin_lock_irqsave(&pci_pic_lock, flags);
 
                setbits32(&priv->regs->mask, 1 << irq);
                mb();
 
-               spin_unlock_irqrestore(&pci_pic_lock, flags);
+               raw_spin_unlock_irqrestore(&pci_pic_lock, flags);
        }
 }
 
@@ -62,14 +63,13 @@ static void pq2ads_pci_unmask_irq(unsigned int virq)
        if (irq != -1) {
                unsigned long flags;
 
-               spin_lock_irqsave(&pci_pic_lock, flags);
+               raw_spin_lock_irqsave(&pci_pic_lock, flags);
                clrbits32(&priv->regs->mask, 1 << irq);
-               spin_unlock_irqrestore(&pci_pic_lock, flags);
+               raw_spin_unlock_irqrestore(&pci_pic_lock, flags);
        }
 }
 
 static struct irq_chip pq2ads_pci_ic = {
-       .typename = "PQ2 ADS PCI",
        .name = "PQ2 ADS PCI",
        .end = pq2ads_pci_unmask_irq,
        .mask = pq2ads_pci_mask_irq,
@@ -107,7 +107,7 @@ static void pq2ads_pci_irq_demux(unsigned int irq, struct irq_desc *desc)
 static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
                            irq_hw_number_t hw)
 {
-       get_irq_desc(virq)->status |= IRQ_LEVEL;
+       irq_to_desc(virq)->status |= IRQ_LEVEL;
        set_irq_chip_data(virq, h->host_data);
        set_irq_chip_and_handler(virq, &pq2ads_pci_ic, handle_level_irq);
        return 0;
@@ -147,7 +147,7 @@ int __init pq2ads_pci_init_irq(void)
                goto out;
        }
 
-       priv = alloc_bootmem(sizeof(struct pq2ads_pci_pic));
+       priv = kzalloc(sizeof(*priv), GFP_KERNEL);
        if (!priv) {
                of_node_put(np);
                ret = -ENOMEM;
@@ -186,7 +186,7 @@ out_unmap_regs:
        iounmap(priv->regs);
 out_free_bootmem:
        free_bootmem((unsigned long)priv,
-                    sizeof(sizeof(struct pq2ads_pci_pic)));
+                    sizeof(struct pq2ads_pci_pic));
        of_node_put(np);
 out_unmap_irq:
        irq_dispose_mapping(irq);