14 files changed, 62 insertions, 58 deletions

diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index a4b41dbde128..ecad10d4e928 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -77,7 +77,7 @@ static void cpm_end_irq(unsigned int irq)
 }
 
 static struct irq_chip cpm_pic = {
-        .name = " CPM PIC ",
+        .name = "CPM PIC",
         .mask = cpm_mask_irq,
         .unmask = cpm_unmask_irq,
         .eoi = cpm_end_irq,
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index 1709ac5aac7c..fcea4ff825dd 100644
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -198,7 +198,7 @@ err_sense:
 }
 
 static struct irq_chip cpm2_pic = {
-        .name = " CPM2 SIU ",
+        .name = "CPM2 SIU",
         .mask = cpm2_mask_irq,
         .unmask = cpm2_unmask_irq,
         .ack = cpm2_ack,
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index c6e11b077108..e094367d7739 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -47,7 +47,7 @@ static struct irq_chip fsl_msi_chip = {
         .mask           = mask_msi_irq,
         .unmask         = unmask_msi_irq,
         .ack            = fsl_msi_end_irq,
-        .name   = " FSL-MSI  ",
+        .name           = "FSL-MSI",
 };
 
 static int fsl_msi_host_map(struct irq_host *h, unsigned int virq,
diff --git a/arch/powerpc/sysdev/grackle.c b/arch/powerpc/sysdev/grackle.c
index 5da37c2f22ee..cf27df6e508b 100644
--- a/arch/powerpc/sysdev/grackle.c
+++ b/arch/powerpc/sysdev/grackle.c
@@ -56,9 +56,9 @@ static inline void grackle_set_loop_snoop(struct pci_controller *bp, int enable)
 void __init setup_grackle(struct pci_controller *hose)
 {
         setup_indirect_pci(hose, 0xfec00000, 0xfee00000, 0);
-        if (machine_is_compatible("PowerMac1,1"))
+        if (of_machine_is_compatible("PowerMac1,1"))
                 ppc_pci_add_flags(PPC_PCI_REASSIGN_ALL_BUS);
-        if (machine_is_compatible("AAPL,PowerBook1998"))
+        if (of_machine_is_compatible("AAPL,PowerBook1998"))
                 grackle_set_loop_snoop(hose, 1);
 #if 0   /* Disabled for now, HW problems ??? */
         grackle_set_stg(hose, 1);
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index 0a55db8a5a29..6323e70e6bf4 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -23,7 +23,7 @@ static unsigned char cached_8259[2] = { 0xff, 0xff };
 #define cached_A1 (cached_8259[0])
 #define cached_21 (cached_8259[1])
 
-static DEFINE_SPINLOCK(i8259_lock);
+static DEFINE_RAW_SPINLOCK(i8259_lock);
 
 static struct irq_host *i8259_host;
 
@@ -42,7 +42,7 @@ unsigned int i8259_irq(void)
         if (pci_intack)
                 irq = readb(pci_intack);
         else {
-                spin_lock(&i8259_lock);
+                raw_spin_lock(&i8259_lock);
                 lock = 1;
 
                 /* Perform an interrupt acknowledge cycle on controller 1. */
@@ -74,7 +74,7 @@ unsigned int i8259_irq(void)
                 irq = NO_IRQ;
 
         if (lock)
-                spin_unlock(&i8259_lock);
+                raw_spin_unlock(&i8259_lock);
         return irq;
 }
 
@@ -82,7 +82,7 @@ static void i8259_mask_and_ack_irq(unsigned int irq_nr)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&i8259_lock, flags);
+        raw_spin_lock_irqsave(&i8259_lock, flags);
         if (irq_nr > 7) {
                 cached_A1 |= 1 << (irq_nr-8);
                 inb(0xA1);      /* DUMMY */
@@ -95,7 +95,7 @@ static void i8259_mask_and_ack_irq(unsigned int irq_nr)
                 outb(cached_21, 0x21);
                 outb(0x20, 0x20);       /* Non-specific EOI */
         }
-        spin_unlock_irqrestore(&i8259_lock, flags);
+        raw_spin_unlock_irqrestore(&i8259_lock, flags);
 }
 
 static void i8259_set_irq_mask(int irq_nr)
@@ -110,13 +110,13 @@ static void i8259_mask_irq(unsigned int irq_nr)
 
         pr_debug("i8259_mask_irq(%d)\n", irq_nr);
 
-        spin_lock_irqsave(&i8259_lock, flags);
+        raw_spin_lock_irqsave(&i8259_lock, flags);
         if (irq_nr < 8)
                 cached_21 |= 1 << irq_nr;
         else
                 cached_A1 |= 1 << (irq_nr-8);
         i8259_set_irq_mask(irq_nr);
-        spin_unlock_irqrestore(&i8259_lock, flags);
+        raw_spin_unlock_irqrestore(&i8259_lock, flags);
 }
 
 static void i8259_unmask_irq(unsigned int irq_nr)
@@ -125,17 +125,17 @@ static void i8259_unmask_irq(unsigned int irq_nr)
 
         pr_debug("i8259_unmask_irq(%d)\n", irq_nr);
 
-        spin_lock_irqsave(&i8259_lock, flags);
+        raw_spin_lock_irqsave(&i8259_lock, flags);
         if (irq_nr < 8)
                 cached_21 &= ~(1 << irq_nr);
         else
                 cached_A1 &= ~(1 << (irq_nr-8));
         i8259_set_irq_mask(irq_nr);
-        spin_unlock_irqrestore(&i8259_lock, flags);
+        raw_spin_unlock_irqrestore(&i8259_lock, flags);
 }
 
 static struct irq_chip i8259_pic = {
-        .name           = " i8259    ",
+        .name           = "i8259",
         .mask           = i8259_mask_irq,
         .disable        = i8259_mask_irq,
         .unmask         = i8259_unmask_irq,
@@ -241,7 +241,7 @@ void i8259_init(struct device_node *node, unsigned long intack_addr)
         unsigned long flags;
 
         /* initialize the controller */
-        spin_lock_irqsave(&i8259_lock, flags);
+        raw_spin_lock_irqsave(&i8259_lock, flags);
 
         /* Mask all first */
         outb(0xff, 0xA1);
@@ -273,7 +273,7 @@ void i8259_init(struct device_node *node, unsigned long intack_addr)
         outb(cached_A1, 0xA1);
         outb(cached_21, 0x21);
 
-        spin_unlock_irqrestore(&i8259_lock, flags);
+        raw_spin_unlock_irqrestore(&i8259_lock, flags);
 
         /* create a legacy host */
         i8259_host = irq_alloc_host(node, IRQ_HOST_MAP_LEGACY,
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 28cdddd2f89e..d7b9b9c69287 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -32,7 +32,7 @@
 
 static struct ipic * primary_ipic;
 static struct irq_chip ipic_level_irq_chip, ipic_edge_irq_chip;
-static DEFINE_SPINLOCK(ipic_lock);
+static DEFINE_RAW_SPINLOCK(ipic_lock);
 
 static struct ipic_info ipic_info[] = {
         [1] = {
@@ -530,13 +530,13 @@ static void ipic_unmask_irq(unsigned int virq)
         unsigned long flags;
         u32 temp;
 
-        spin_lock_irqsave(&ipic_lock, flags);
+        raw_spin_lock_irqsave(&ipic_lock, flags);
 
         temp = ipic_read(ipic->regs, ipic_info[src].mask);
         temp |= (1 << (31 - ipic_info[src].bit));
         ipic_write(ipic->regs, ipic_info[src].mask, temp);
 
-        spin_unlock_irqrestore(&ipic_lock, flags);
+        raw_spin_unlock_irqrestore(&ipic_lock, flags);
 }
 
 static void ipic_mask_irq(unsigned int virq)
@@ -546,7 +546,7 @@ static void ipic_mask_irq(unsigned int virq)
         unsigned long flags;
         u32 temp;
 
-        spin_lock_irqsave(&ipic_lock, flags);
+        raw_spin_lock_irqsave(&ipic_lock, flags);
 
         temp = ipic_read(ipic->regs, ipic_info[src].mask);
         temp &= ~(1 << (31 - ipic_info[src].bit));
@@ -556,7 +556,7 @@ static void ipic_mask_irq(unsigned int virq)
          * for nearly all cases. */
         mb();
 
-        spin_unlock_irqrestore(&ipic_lock, flags);
+        raw_spin_unlock_irqrestore(&ipic_lock, flags);
 }
 
 static void ipic_ack_irq(unsigned int virq)
@@ -566,7 +566,7 @@ static void ipic_ack_irq(unsigned int virq)
         unsigned long flags;
         u32 temp;
 
-        spin_lock_irqsave(&ipic_lock, flags);
+        raw_spin_lock_irqsave(&ipic_lock, flags);
 
         temp = 1 << (31 - ipic_info[src].bit);
         ipic_write(ipic->regs, ipic_info[src].ack, temp);
@@ -575,7 +575,7 @@ static void ipic_ack_irq(unsigned int virq)
          * for nearly all cases. */
         mb();
 
-        spin_unlock_irqrestore(&ipic_lock, flags);
+        raw_spin_unlock_irqrestore(&ipic_lock, flags);
 }
 
 static void ipic_mask_irq_and_ack(unsigned int virq)
@@ -585,7 +585,7 @@ static void ipic_mask_irq_and_ack(unsigned int virq)
         unsigned long flags;
         u32 temp;
 
-        spin_lock_irqsave(&ipic_lock, flags);
+        raw_spin_lock_irqsave(&ipic_lock, flags);
 
         temp = ipic_read(ipic->regs, ipic_info[src].mask);
         temp &= ~(1 << (31 - ipic_info[src].bit));
@@ -598,7 +598,7 @@ static void ipic_mask_irq_and_ack(unsigned int virq)
          * for nearly all cases. */
         mb();
 
-        spin_unlock_irqrestore(&ipic_lock, flags);
+        raw_spin_unlock_irqrestore(&ipic_lock, flags);
 }
 
 static int ipic_set_irq_type(unsigned int virq, unsigned int flow_type)
@@ -660,7 +660,7 @@ static int ipic_set_irq_type(unsigned int virq, unsigned int flow_type)
 
 /* level interrupts and edge interrupts have different ack operations */
 static struct irq_chip ipic_level_irq_chip = {
-        .name           = " IPIC  ",
+        .name           = "IPIC",
         .unmask         = ipic_unmask_irq,
         .mask           = ipic_mask_irq,
         .mask_ack       = ipic_mask_irq,
@@ -668,7 +668,7 @@ static struct irq_chip ipic_level_irq_chip = {
 };
 
 static struct irq_chip ipic_edge_irq_chip = {
-        .name           = " IPIC  ",
+        .name           = "IPIC",
         .unmask         = ipic_unmask_irq,
         .mask           = ipic_mask_irq,
         .mask_ack       = ipic_mask_irq_and_ack,
diff --git a/arch/powerpc/sysdev/mpc8xx_pic.c b/arch/powerpc/sysdev/mpc8xx_pic.c
index 69bd6f4dff83..8c27d261aba8 100644
--- a/arch/powerpc/sysdev/mpc8xx_pic.c
+++ b/arch/powerpc/sysdev/mpc8xx_pic.c
@@ -94,7 +94,7 @@ static int mpc8xx_set_irq_type(unsigned int virq, unsigned int flow_type)
 }
 
 static struct irq_chip mpc8xx_pic = {
-        .name = " MPC8XX SIU ",
+        .name = "MPC8XX SIU",
         .unmask = mpc8xx_unmask_irq,
         .mask = mpc8xx_mask_irq,
         .ack = mpc8xx_ack,
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 470dc6c11d57..339e8a3e26d2 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -46,7 +46,7 @@
 
 static struct mpic *mpics;
 static struct mpic *mpic_primary;
-static DEFINE_SPINLOCK(mpic_lock);
+static DEFINE_RAW_SPINLOCK(mpic_lock);
 
 #ifdef CONFIG_PPC32     /* XXX for now */
 #ifdef CONFIG_IRQ_ALL_CPUS
@@ -347,10 +347,10 @@ static inline void mpic_ht_end_irq(struct mpic *mpic, unsigned int source)
                 unsigned int mask = 1U << (fixup->index & 0x1f);
                 writel(mask, fixup->applebase + soff);
         } else {
-                spin_lock(&mpic->fixup_lock);
+                raw_spin_lock(&mpic->fixup_lock);
                 writeb(0x11 + 2 * fixup->index, fixup->base + 2);
                 writel(fixup->data, fixup->base + 4);
-                spin_unlock(&mpic->fixup_lock);
+                raw_spin_unlock(&mpic->fixup_lock);
         }
 }
 
@@ -366,7 +366,7 @@ static void mpic_startup_ht_interrupt(struct mpic *mpic, unsigned int source,
 
         DBG("startup_ht_interrupt(0x%x, 0x%x) index: %d\n",
             source, irqflags, fixup->index);
-        spin_lock_irqsave(&mpic->fixup_lock, flags);
+        raw_spin_lock_irqsave(&mpic->fixup_lock, flags);
         /* Enable and configure */
         writeb(0x10 + 2 * fixup->index, fixup->base + 2);
         tmp = readl(fixup->base + 4);
@@ -374,7 +374,7 @@ static void mpic_startup_ht_interrupt(struct mpic *mpic, unsigned int source,
         if (irqflags & IRQ_LEVEL)
                 tmp |= 0x22;
         writel(tmp, fixup->base + 4);
-        spin_unlock_irqrestore(&mpic->fixup_lock, flags);
+        raw_spin_unlock_irqrestore(&mpic->fixup_lock, flags);
 
 #ifdef CONFIG_PM
         /* use the lowest bit inverted to the actual HW,
@@ -396,12 +396,12 @@ static void mpic_shutdown_ht_interrupt(struct mpic *mpic, unsigned int source,
         DBG("shutdown_ht_interrupt(0x%x, 0x%x)\n", source, irqflags);
 
         /* Disable */
-        spin_lock_irqsave(&mpic->fixup_lock, flags);
+        raw_spin_lock_irqsave(&mpic->fixup_lock, flags);
         writeb(0x10 + 2 * fixup->index, fixup->base + 2);
         tmp = readl(fixup->base + 4);
         tmp |= 1;
         writel(tmp, fixup->base + 4);
-        spin_unlock_irqrestore(&mpic->fixup_lock, flags);
+        raw_spin_unlock_irqrestore(&mpic->fixup_lock, flags);
 
 #ifdef CONFIG_PM
         /* use the lowest bit inverted to the actual HW,
@@ -515,7 +515,7 @@ static void __init mpic_scan_ht_pics(struct mpic *mpic)
         BUG_ON(mpic->fixups == NULL);
 
         /* Init spinlock */
-        spin_lock_init(&mpic->fixup_lock);
+        raw_spin_lock_init(&mpic->fixup_lock);
 
         /* Map U3 config space. We assume all IO-APICs are on the primary bus
          * so we only need to map 64kB.
@@ -573,12 +573,12 @@ static int irq_choose_cpu(const cpumask_t *mask)
 
         if (cpumask_equal(mask, cpu_all_mask)) {
                 static int irq_rover;
-                static DEFINE_SPINLOCK(irq_rover_lock);
+                static DEFINE_RAW_SPINLOCK(irq_rover_lock);
                 unsigned long flags;
 
                 /* Round-robin distribution... */
         do_round_robin:
-                spin_lock_irqsave(&irq_rover_lock, flags);
+                raw_spin_lock_irqsave(&irq_rover_lock, flags);
 
                 while (!cpu_online(irq_rover)) {
                         if (++irq_rover >= NR_CPUS)
@@ -590,7 +590,7 @@ static int irq_choose_cpu(const cpumask_t *mask)
                                 irq_rover = 0;
                 } while (!cpu_online(irq_rover));
 
-                spin_unlock_irqrestore(&irq_rover_lock, flags);
+                raw_spin_unlock_irqrestore(&irq_rover_lock, flags);
         } else {
                 cpuid = cpumask_first_and(mask, cpu_online_mask);
                 if (cpuid >= nr_cpu_ids)
@@ -1368,14 +1368,14 @@ void __init mpic_set_serial_int(struct mpic *mpic, int enable)
         unsigned long flags;
         u32 v;
 
-        spin_lock_irqsave(&mpic_lock, flags);
+        raw_spin_lock_irqsave(&mpic_lock, flags);
         v = mpic_read(mpic->gregs, MPIC_GREG_GLOBAL_CONF_1);
         if (enable)
                 v |= MPIC_GREG_GLOBAL_CONF_1_SIE;
         else
                 v &= ~MPIC_GREG_GLOBAL_CONF_1_SIE;
         mpic_write(mpic->gregs, MPIC_GREG_GLOBAL_CONF_1, v);
-        spin_unlock_irqrestore(&mpic_lock, flags);
+        raw_spin_unlock_irqrestore(&mpic_lock, flags);
 }
 
 void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
@@ -1388,7 +1388,7 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
         if (!mpic)
                 return;
 
-        spin_lock_irqsave(&mpic_lock, flags);
+        raw_spin_lock_irqsave(&mpic_lock, flags);
         if (mpic_is_ipi(mpic, irq)) {
                 reg = mpic_ipi_read(src - mpic->ipi_vecs[0]) &
                         ~MPIC_VECPRI_PRIORITY_MASK;
@@ -1400,7 +1400,7 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
                 mpic_irq_write(src, MPIC_INFO(IRQ_VECTOR_PRI),
                                reg | (pri << MPIC_VECPRI_PRIORITY_SHIFT));
         }
-        spin_unlock_irqrestore(&mpic_lock, flags);
+        raw_spin_unlock_irqrestore(&mpic_lock, flags);
 }
 
 void mpic_setup_this_cpu(void)
@@ -1415,7 +1415,7 @@ void mpic_setup_this_cpu(void)
 
         DBG("%s: setup_this_cpu(%d)\n", mpic->name, hard_smp_processor_id());
 
-        spin_lock_irqsave(&mpic_lock, flags);
+        raw_spin_lock_irqsave(&mpic_lock, flags);
 
         /* let the mpic know we want intrs. default affinity is 0xffffffff
          * until changed via /proc. That's how it's done on x86. If we want
@@ -1431,7 +1431,7 @@ void mpic_setup_this_cpu(void)
         /* Set current processor priority to 0 */
         mpic_cpu_write(MPIC_INFO(CPU_CURRENT_TASK_PRI), 0);
 
-        spin_unlock_irqrestore(&mpic_lock, flags);
+        raw_spin_unlock_irqrestore(&mpic_lock, flags);
 #endif /* CONFIG_SMP */
 }
 
@@ -1460,7 +1460,7 @@ void mpic_teardown_this_cpu(int secondary)
         BUG_ON(mpic == NULL);
 
         DBG("%s: teardown_this_cpu(%d)\n", mpic->name, hard_smp_processor_id());
-        spin_lock_irqsave(&mpic_lock, flags);
+        raw_spin_lock_irqsave(&mpic_lock, flags);
 
         /* let the mpic know we don't want intrs.  */
         for (i = 0; i < mpic->num_sources ; i++)
@@ -1474,7 +1474,7 @@ void mpic_teardown_this_cpu(int secondary)
          */
         mpic_eoi(mpic);
 
-        spin_unlock_irqrestore(&mpic_lock, flags);
+        raw_spin_unlock_irqrestore(&mpic_lock, flags);
 }
 
 
@@ -1575,7 +1575,7 @@ void mpic_request_ipis(void)
         int i;
         BUG_ON(mpic == NULL);
 
-        printk(KERN_INFO "mpic: requesting IPIs ... \n");
+        printk(KERN_INFO "mpic: requesting IPIs...\n");
 
         for (i = 0; i < 4; i++) {
                 unsigned int vipi = irq_create_mapping(mpic->irqhost,
diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c
index 0f6ab06f8474..3b6a9a43718f 100644
--- a/arch/powerpc/sysdev/mpic_pasemi_msi.c
+++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c
@@ -60,7 +60,7 @@ static struct irq_chip mpic_pasemi_msi_chip = {
         .eoi            = mpic_end_irq,
         .set_type       = mpic_set_irq_type,
         .set_affinity   = mpic_set_affinity,
-        .name           = "PASEMI-MSI ",
+        .name           = "PASEMI-MSI",
 };
 
 static int pasemi_msi_check_device(struct pci_dev *pdev, int nvec, int type)
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index b6bd775d2e22..31acd3b1718b 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -16,6 +16,7 @@
 #include <linux/mv643xx.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/prom.h>
 
@@ -189,6 +190,7 @@ static int __init mv64x60_mpsc_device_setup(struct device_node *np, int id)
         pdev = platform_device_alloc(MPSC_CTLR_NAME, port_number);
         if (!pdev)
                 return -ENOMEM;
+        pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 
         err = platform_device_add_resources(pdev, r, 5);
         if (err)
@@ -302,6 +304,7 @@ static int __init mv64x60_eth_device_setup(struct device_node *np, int id,
         if (!pdev)
                 return -ENOMEM;
 
+        pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
         err = platform_device_add_resources(pdev, r, 1);
         if (err)
                 goto error;
diff --git a/arch/powerpc/sysdev/ppc4xx_soc.c b/arch/powerpc/sysdev/ppc4xx_soc.c
index 5b32adc9a9b2..5c014350bf16 100644
--- a/arch/powerpc/sysdev/ppc4xx_soc.c
+++ b/arch/powerpc/sysdev/ppc4xx_soc.c
@@ -174,7 +174,8 @@ static int __init ppc4xx_l2c_probe(void)
                 | L2C_CFG_CPIM | L2C_CFG_TPIM | L2C_CFG_LIM | L2C_CFG_SMCM;
 
         /* Check for 460EX/GT special handling */
-        if (of_device_is_compatible(np, "ibm,l2-cache-460ex"))
+        if (of_device_is_compatible(np, "ibm,l2-cache-460ex") ||
+            of_device_is_compatible(np, "ibm,l2-cache-460gt"))
                 r |= L2C_CFG_RDBW;
 
         mtdcr(dcrbase_l2c + DCRN_L2C0_CFG, r);
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index 2acc928d1920..d927da893ec4 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -237,7 +237,7 @@ static void qe_ic_mask_irq(unsigned int virq)
 }
 
 static struct irq_chip qe_ic_irq_chip = {
-        .name = " QEIC  ",
+        .name = "QEIC",
         .unmask = qe_ic_unmask_irq,
         .mask = qe_ic_mask_irq,
         .mask_ack = qe_ic_mask_irq,
@@ -256,7 +256,7 @@ static int qe_ic_host_map(struct irq_host *h, unsigned int virq,
         struct irq_chip *chip;
 
         if (qe_ic_info[hw].mask == 0) {
-                printk(KERN_ERR "Can't map reserved IRQ \n");
+                printk(KERN_ERR "Can't map reserved IRQ\n");
                 return -EINVAL;
         }
         /* Default chip */
diff --git a/arch/powerpc/sysdev/qe_lib/qe_io.c b/arch/powerpc/sysdev/qe_lib/qe_io.c
index 7c87460179ef..77e4934b88c5 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_io.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_io.c
@@ -157,13 +157,13 @@ int par_io_of_config(struct device_node *np)
         const unsigned int *pio_map;
 
         if (par_io == NULL) {
-                printk(KERN_ERR "par_io not initialized \n");
+                printk(KERN_ERR "par_io not initialized\n");
                 return -1;
         }
 
         ph = of_get_property(np, "pio-handle", NULL);
         if (ph == NULL) {
-                printk(KERN_ERR "pio-handle not available \n");
+                printk(KERN_ERR "pio-handle not available\n");
                 return -1;
         }
 
@@ -171,12 +171,12 @@ int par_io_of_config(struct device_node *np)
 
         pio_map = of_get_property(pio, "pio-map", &pio_map_len);
         if (pio_map == NULL) {
-                printk(KERN_ERR "pio-map is not set! \n");
+                printk(KERN_ERR "pio-map is not set!\n");
                 return -1;
         }
         pio_map_len /= sizeof(unsigned int);
         if ((pio_map_len % 6) != 0) {
-                printk(KERN_ERR "pio-map format wrong! \n");
+                printk(KERN_ERR "pio-map format wrong!\n");
                 return -1;
         }
 
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 6f220a913e42..0038fb78f094 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -177,7 +177,7 @@ static int uic_set_irq_type(unsigned int virq, unsigned int flow_type)
 }
 
 static struct irq_chip uic_irq_chip = {
-        .name           = " UIC  ",
+        .name           = "UIC",
         .unmask         = uic_unmask_irq,
         .mask           = uic_mask_irq,
         .mask_ack       = uic_mask_ack_irq,