aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2013-08-06 12:01:24 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-08-13 21:50:24 -0400
commitb0d436c739b0d4afcdfe2e97d4d1ee41ea2db62e (patch)
treee1bcbf43d70097c6b86cc53e5a4583643bf42b3b /arch/powerpc/kernel
parenta0a96ee9ba9ea188dee9126dbb404ff6253318cd (diff)
powerpc: Fix a number of sparse warnings
Address some of the trivial sparse warnings in arch/powerpc. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/legacy_serial.c2
-rw-r--r--arch/powerpc/kernel/pci-common.c4
-rw-r--r--arch/powerpc/kernel/pci_64.c2
-rw-r--r--arch/powerpc/kernel/setup_64.c4
-rw-r--r--arch/powerpc/kernel/signal_64.c8
-rw-r--r--arch/powerpc/kernel/smp.c2
6 files changed, 11 insertions, 11 deletions
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 0733b05eb856..af1c63fc7dac 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -99,7 +99,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
99 legacy_serial_count = index + 1; 99 legacy_serial_count = index + 1;
100 100
101 /* Check if there is a port who already claimed our slot */ 101 /* Check if there is a port who already claimed our slot */
102 if (legacy_serial_infos[index].np != 0) { 102 if (legacy_serial_infos[index].np != NULL) {
103 /* if we still have some room, move it, else override */ 103 /* if we still have some room, move it, else override */
104 if (legacy_serial_count < MAX_LEGACY_SERIAL_PORTS) { 104 if (legacy_serial_count < MAX_LEGACY_SERIAL_PORTS) {
105 printk(KERN_DEBUG "Moved legacy port %d -> %d\n", 105 printk(KERN_DEBUG "Moved legacy port %d -> %d\n",
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 7d22a675fe1a..22fe40140e43 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -306,7 +306,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
306 unsigned long io_offset = 0; 306 unsigned long io_offset = 0;
307 int i, res_bit; 307 int i, res_bit;
308 308
309 if (hose == 0) 309 if (hose == NULL)
310 return NULL; /* should never happen */ 310 return NULL; /* should never happen */
311 311
312 /* If memory, add on the PCI bridge address offset */ 312 /* If memory, add on the PCI bridge address offset */
@@ -1578,7 +1578,7 @@ fake_pci_bus(struct pci_controller *hose, int busnr)
1578{ 1578{
1579 static struct pci_bus bus; 1579 static struct pci_bus bus;
1580 1580
1581 if (hose == 0) { 1581 if (hose == NULL) {
1582 printk(KERN_ERR "Can't find hose for PCI bus %d!\n", busnr); 1582 printk(KERN_ERR "Can't find hose for PCI bus %d!\n", busnr);
1583 } 1583 }
1584 bus.number = busnr; 1584 bus.number = busnr;
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 2e8629654ca8..cdf5aa1411bf 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -109,7 +109,7 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
109 hose = pci_bus_to_host(bus); 109 hose = pci_bus_to_host(bus);
110 110
111 /* Check if we have IOs allocated */ 111 /* Check if we have IOs allocated */
112 if (hose->io_base_alloc == 0) 112 if (hose->io_base_alloc == NULL)
113 return 0; 113 return 0;
114 114
115 pr_debug("IO unmapping for PHB %s\n", hose->dn->full_name); 115 pr_debug("IO unmapping for PHB %s\n", hose->dn->full_name);
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index f03770e0fc8d..79ba9b77fe72 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -325,7 +325,7 @@ static void __init initialize_cache_info(void)
325 NULL); 325 NULL);
326 if (lsizep != NULL) 326 if (lsizep != NULL)
327 lsize = *lsizep; 327 lsize = *lsizep;
328 if (sizep == 0 || lsizep == 0) 328 if (sizep == NULL || lsizep == NULL)
329 DBG("Argh, can't find dcache properties ! " 329 DBG("Argh, can't find dcache properties ! "
330 "sizep: %p, lsizep: %p\n", sizep, lsizep); 330 "sizep: %p, lsizep: %p\n", sizep, lsizep);
331 331
@@ -347,7 +347,7 @@ static void __init initialize_cache_info(void)
347 NULL); 347 NULL);
348 if (lsizep != NULL) 348 if (lsizep != NULL)
349 lsize = *lsizep; 349 lsize = *lsizep;
350 if (sizep == 0 || lsizep == 0) 350 if (sizep == NULL || lsizep == NULL)
351 DBG("Argh, can't find icache properties ! " 351 DBG("Argh, can't find icache properties ! "
352 "sizep: %p, lsizep: %p\n", sizep, lsizep); 352 "sizep: %p, lsizep: %p\n", sizep, lsizep);
353 353
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 887e99d85bc2..cbd26928e04d 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -346,13 +346,13 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
346 if (v_regs && !access_ok(VERIFY_READ, v_regs, 34 * sizeof(vector128))) 346 if (v_regs && !access_ok(VERIFY_READ, v_regs, 34 * sizeof(vector128)))
347 return -EFAULT; 347 return -EFAULT;
348 /* Copy 33 vec registers (vr0..31 and vscr) from the stack */ 348 /* Copy 33 vec registers (vr0..31 and vscr) from the stack */
349 if (v_regs != 0 && (msr & MSR_VEC) != 0) 349 if (v_regs != NULL && (msr & MSR_VEC) != 0)
350 err |= __copy_from_user(current->thread.vr, v_regs, 350 err |= __copy_from_user(current->thread.vr, v_regs,
351 33 * sizeof(vector128)); 351 33 * sizeof(vector128));
352 else if (current->thread.used_vr) 352 else if (current->thread.used_vr)
353 memset(current->thread.vr, 0, 33 * sizeof(vector128)); 353 memset(current->thread.vr, 0, 33 * sizeof(vector128));
354 /* Always get VRSAVE back */ 354 /* Always get VRSAVE back */
355 if (v_regs != 0) 355 if (v_regs != NULL)
356 err |= __get_user(current->thread.vrsave, (u32 __user *)&v_regs[33]); 356 err |= __get_user(current->thread.vrsave, (u32 __user *)&v_regs[33]);
357 else 357 else
358 current->thread.vrsave = 0; 358 current->thread.vrsave = 0;
@@ -463,7 +463,7 @@ static long restore_tm_sigcontexts(struct pt_regs *regs,
463 tm_v_regs, 34 * sizeof(vector128))) 463 tm_v_regs, 34 * sizeof(vector128)))
464 return -EFAULT; 464 return -EFAULT;
465 /* Copy 33 vec registers (vr0..31 and vscr) from the stack */ 465 /* Copy 33 vec registers (vr0..31 and vscr) from the stack */
466 if (v_regs != 0 && tm_v_regs != 0 && (msr & MSR_VEC) != 0) { 466 if (v_regs != NULL && tm_v_regs != NULL && (msr & MSR_VEC) != 0) {
467 err |= __copy_from_user(current->thread.vr, v_regs, 467 err |= __copy_from_user(current->thread.vr, v_regs,
468 33 * sizeof(vector128)); 468 33 * sizeof(vector128));
469 err |= __copy_from_user(current->thread.transact_vr, tm_v_regs, 469 err |= __copy_from_user(current->thread.transact_vr, tm_v_regs,
@@ -474,7 +474,7 @@ static long restore_tm_sigcontexts(struct pt_regs *regs,
474 memset(current->thread.transact_vr, 0, 33 * sizeof(vector128)); 474 memset(current->thread.transact_vr, 0, 33 * sizeof(vector128));
475 } 475 }
476 /* Always get VRSAVE back */ 476 /* Always get VRSAVE back */
477 if (v_regs != 0 && tm_v_regs != 0) { 477 if (v_regs != NULL && tm_v_regs != NULL) {
478 err |= __get_user(current->thread.vrsave, 478 err |= __get_user(current->thread.vrsave,
479 (u32 __user *)&v_regs[33]); 479 (u32 __user *)&v_regs[33]);
480 err |= __get_user(current->thread.transact_vrsave, 480 err |= __get_user(current->thread.transact_vrsave,
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 38b0ba65a735..9882240020c0 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -172,7 +172,7 @@ int smp_request_message_ipi(int virq, int msg)
172#endif 172#endif
173 err = request_irq(virq, smp_ipi_action[msg], 173 err = request_irq(virq, smp_ipi_action[msg],
174 IRQF_PERCPU | IRQF_NO_THREAD | IRQF_NO_SUSPEND, 174 IRQF_PERCPU | IRQF_NO_THREAD | IRQF_NO_SUSPEND,
175 smp_ipi_name[msg], 0); 175 smp_ipi_name[msg], NULL);
176 WARN(err < 0, "unable to request_irq %d for %s (rc %d)\n", 176 WARN(err < 0, "unable to request_irq %d for %s (rc %d)\n",
177 virq, smp_ipi_name[msg], err); 177 virq, smp_ipi_name[msg], err);
178 178