8 files changed, 29 insertions, 43 deletions

diff --git a/arch/ppc/syslib/cpc700_pic.c b/arch/ppc/syslib/cpc700_pic.c
index 774709807538..75fe8eb10693 100644
--- a/arch/ppc/syslib/cpc700_pic.c
+++ b/arch/ppc/syslib/cpc700_pic.c
@@ -90,14 +90,10 @@ cpc700_mask_and_ack_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type cpc700_pic = {
-        "CPC700 PIC",
-        NULL,
-        NULL,
-        cpc700_unmask_irq,
-        cpc700_mask_irq,
-        cpc700_mask_and_ack_irq,
-        NULL,
-        NULL
+        .typename = "CPC700 PIC",
+        .enable = cpc700_unmask_irq,
+        .disable = cpc700_mask_irq,
+        .ack = cpc700_mask_and_ack_irq,
 };
 
 __init static void
diff --git a/arch/ppc/syslib/i8259.c b/arch/ppc/syslib/i8259.c
index b9391e650141..5c7908c20e43 100644
--- a/arch/ppc/syslib/i8259.c
+++ b/arch/ppc/syslib/i8259.c
@@ -129,14 +129,11 @@ static void i8259_end_irq(unsigned int irq)
 }
 
 struct hw_interrupt_type i8259_pic = {
-        " i8259    ",
-        NULL,
-        NULL,
-        i8259_unmask_irq,
-        i8259_mask_irq,
-        i8259_mask_and_ack_irq,
-        i8259_end_irq,
-        NULL
+        .typename = " i8259    ",
+        .enable = i8259_unmask_irq,
+        .disable = i8259_mask_irq,
+        .ack = i8259_mask_and_ack_irq,
+        .end = i8259_end_irq,
 };
 
 static struct resource pic1_iores = {
diff --git a/arch/ppc/syslib/ibm440gx_common.c b/arch/ppc/syslib/ibm440gx_common.c
index d4776af6a3ca..0bb919859b8b 100644
--- a/arch/ppc/syslib/ibm440gx_common.c
+++ b/arch/ppc/syslib/ibm440gx_common.c
@@ -236,9 +236,10 @@ void __init ibm440gx_l2c_setup(struct ibm44x_clocks* p)
         /* Disable L2C on rev.A, rev.B and 800MHz version of rev.C,
            enable it on all other revisions
          */
-        u32 pvr = mfspr(SPRN_PVR);
-        if (pvr == PVR_440GX_RA || pvr == PVR_440GX_RB ||
-            (pvr == PVR_440GX_RC && p->cpu > 667000000))
+        if (strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. A") == 0 ||
+                        strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. B") == 0
+                        || (strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. C")
+                                == 0 && p->cpu > 667000000))
                 ibm440gx_l2c_disable();
         else
                 ibm440gx_l2c_enable();
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 6262b11f366f..839f8872826f 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -31,7 +31,7 @@
 
 
 u8 mv64x60_pci_exclude_bridge = 1;
-spinlock_t      mv64x60_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(mv64x60_lock);
 
 static phys_addr_t      mv64x60_bridge_pbase;
 static void             *mv64x60_bridge_vbase;
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c
index 7e272c51a497..2e0ea92144f6 100644
--- a/arch/ppc/syslib/open_pic2.c
+++ b/arch/ppc/syslib/open_pic2.c
@@ -82,13 +82,11 @@ static void openpic2_end_irq(unsigned int irq_nr);
 static void openpic2_ack_irq(unsigned int irq_nr);
 
 struct hw_interrupt_type open_pic2 = {
-        " OpenPIC2 ",
-        NULL,
-        NULL,
-        openpic2_enable_irq,
-        openpic2_disable_irq,
-        openpic2_ack_irq,
-        openpic2_end_irq,
+        .typename = " OpenPIC2 ",
+        .enable = openpic2_enable_irq,
+        .disable = openpic2_disable_irq,
+        .ack = openpic2_ack_irq,
+        .end = openpic2_end_irq,
 };
 
 /*
diff --git a/arch/ppc/syslib/ppc403_pic.c b/arch/ppc/syslib/ppc403_pic.c
index 06cb0af2a58d..ce4d1deb86e9 100644
--- a/arch/ppc/syslib/ppc403_pic.c
+++ b/arch/ppc/syslib/ppc403_pic.c
@@ -34,13 +34,10 @@ static void ppc403_aic_disable(unsigned int irq);
 static void ppc403_aic_disable_and_ack(unsigned int irq);
 
 static struct hw_interrupt_type ppc403_aic = {
-        "403GC AIC",
-        NULL,
-        NULL,
-        ppc403_aic_enable,
-        ppc403_aic_disable,
-        ppc403_aic_disable_and_ack,
-        0
+        .typename = "403GC AIC",
+        .enable = ppc403_aic_enable,
+        .disable = ppc403_aic_disable,
+        .ack = ppc403_aic_disable_and_ack,
 };
 
 int
diff --git a/arch/ppc/syslib/qspan_pci.c b/arch/ppc/syslib/qspan_pci.c
index 57f4ed5e5ae1..0970b5d30391 100644
--- a/arch/ppc/syslib/qspan_pci.c
+++ b/arch/ppc/syslib/qspan_pci.c
@@ -94,7 +94,7 @@
 #define mk_config_type1(bus, dev, offset) \
         mk_config_addr(bus, dev, offset) | 1;
 
-static spinlock_t pcibios_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pcibios_lock);
 
 int qspan_pcibios_read_config_byte(unsigned char bus, unsigned char dev_fn,
                                   unsigned char offset, unsigned char *val)
diff --git a/arch/ppc/syslib/xilinx_pic.c b/arch/ppc/syslib/xilinx_pic.c
index e0bd66f0847a..2cbcad278cef 100644
--- a/arch/ppc/syslib/xilinx_pic.c
+++ b/arch/ppc/syslib/xilinx_pic.c
@@ -79,14 +79,11 @@ xilinx_intc_end(unsigned int irq)
 }
 
 static struct hw_interrupt_type xilinx_intc = {
-        "Xilinx Interrupt Controller",
-        NULL,
-        NULL,
-        xilinx_intc_enable,
-        xilinx_intc_disable,
-        xilinx_intc_disable_and_ack,
-        xilinx_intc_end,
-        0
+        .typename = "Xilinx Interrupt Controller",
+        .enable = xilinx_intc_enable,
+        .disable = xilinx_intc_disable,
+        .ack = xilinx_intc_disable_and_ack,
+        .end = xilinx_intc_end,
 };
 
 int