Signed-off-by: Marcin Slusarz <marcin.slus...@gmail.com>
Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: linuxppc-...@ozlabs.org
---
arch/powerpc/kernel/iommu.c | 6 +-----
arch/powerpc/kernel/irq.c | 5 ++---
arch/powerpc/sysdev/ppc4xx_pci.c | 9 ++-------
3 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index fd51578..c7fa258 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -502,7 +502,6 @@ static void iommu_table_clear(struct iommu_table *tbl)
struct iommu_table *iommu_init_table(struct iommu_table *tbl, int nid)
{
unsigned long sz;
- static int welcomed = 0;
struct page *page;
/* Set aside 1/4 of the table for large allocations. */
@@ -523,11 +522,8 @@ struct iommu_table *iommu_init_table(struct iommu_table
*tbl, int nid)
iommu_table_clear(tbl);
- if (!welcomed) {
- printk(KERN_INFO "IOMMU table initialized, virtual merging
%s\n",
+ printk_once(KERN_INFO "IOMMU table initialized, virtual merging %s\n",
novmerge ? "disabled" : "enabled");
- welcomed = 1;
- }
return tbl;
}
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index f7f376e..05ebd21 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -231,7 +231,6 @@ skip:
void fixup_irqs(cpumask_t map)
{
unsigned int irq;
- static int warned;
for_each_irq(irq) {
cpumask_t mask;
@@ -246,8 +245,8 @@ void fixup_irqs(cpumask_t map)
}
if (irq_desc[irq].chip->set_affinity)
irq_desc[irq].chip->set_affinity(irq, &mask);
- else if (irq_desc[irq].action && !(warned++))
- printk("Cannot set affinity for irq %i\n", irq);
+ else if (irq_desc[irq].action)
+ printk_once("Cannot set affinity for irq %i\n", irq);
}
local_irq_enable();
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index 6ff9d71..4282dff 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -1243,19 +1243,14 @@ static int ppc4xx_pciex_validate_bdf(struct
ppc4xx_pciex_port *port,
struct pci_bus *bus,
unsigned int devfn)
{
- static int message;
-
/* Endpoint can not generate upstream(remote) config cycles */
if (port->endpoint && bus->number != port->hose->first_busno)
return PCIBIOS_DEVICE_NOT_FOUND;
/* Check we are within the mapped range */
if (bus->number > port->hose->last_busno) {
- if (!message) {
- printk(KERN_WARNING "Warning! Probing bus %u"
- " out of range !\n", bus->number);
- message++;
- }
+ printk_once(KERN_WARNING
+ "Warning! Probing bus %u out of range!\n", bus->number);
return PCIBIOS_DEVICE_NOT_FOUND;
}
--
1.6.3.3
_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev
