From: Andrew Morton <akpm@linux-foundation.org>

Fix text and coding-style a bit.

Cc: <stable@kernel.org>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Li Shaohua <shaohua.li@intel.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: Zhao Yakui <yakui.zhao@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/pnp/pnpacpi/rsparser.c |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff -puN drivers/pnp/pnpacpi/rsparser.c~pnp-increase-the-maximum-number-of-resources-fix drivers/pnp/pnpacpi/rsparser.c
--- a/drivers/pnp/pnpacpi/rsparser.c~pnp-increase-the-maximum-number-of-resources-fix
+++ a/drivers/pnp/pnpacpi/rsparser.c
@@ -83,8 +83,8 @@ static void pnpacpi_parse_allocated_irqr
 	       i < PNP_MAX_IRQ)
 		i++;
 	if (i >= PNP_MAX_IRQ) {
-		printk(KERN_ERR "Exceed the max number of IRQ resource: "
-				"%d \n",PNP_MAX_IRQ);
+		printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ "
+				"resources: %d \n", PNP_MAX_IRQ);
 		return;
 	}
 #ifdef CONFIG_X86
@@ -176,9 +176,8 @@ static void pnpacpi_parse_allocated_dmar
 		res->dma_resource[i].start = dma;
 		res->dma_resource[i].end = dma;
 	} else {
-		printk(KERN_ERR "Exceed the max number of DMA resource: "
-				"%d \n",PNP_MAX_DMA);
-		return;
+		printk(KERN_ERR "pnpacpi: exceeded the max number of DMA "
+				"resources: %d \n", PNP_MAX_DMA);
 	}
 }
 
@@ -201,9 +200,8 @@ static void pnpacpi_parse_allocated_iore
 		res->port_resource[i].start = io;
 		res->port_resource[i].end = io + len - 1;
 	} else {
-		printk(KERN_ERR "Exceed the max number of IO Resource: "
-				"%d \n",PNP_MAX_PORT);
-		return;
+		printk(KERN_ERR "pnpacpi: exceeded the max number of IO "
+				"resources: %d \n", PNP_MAX_PORT);
 	}
 }
 
@@ -228,9 +226,8 @@ static void pnpacpi_parse_allocated_memr
 		res->mem_resource[i].start = mem;
 		res->mem_resource[i].end = mem + len - 1;
 	} else {
-		printk(KERN_ERR "Exceed the max number of Mem Resource: "
-				"%d \n",PNP_MAX_MEM);
-		return;
+		printk(KERN_ERR "pnpacpi: exceeded the max number of mem "
+				"resources: %d\n", PNP_MAX_MEM);
 	}
 }
 
_