4 files changed, 18 insertions, 13 deletions

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 12a1645a2e43..e85cbf116db1 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -167,7 +167,7 @@ static int pnp_bus_suspend(struct device *dev, pm_message_t state)
                         return error;
         }
 
-        if (pnp_dev->protocol && pnp_dev->protocol->suspend)
+        if (pnp_dev->protocol->suspend)
                 pnp_dev->protocol->suspend(pnp_dev, state);
         return 0;
 }
@@ -181,7 +181,7 @@ static int pnp_bus_resume(struct device *dev)
         if (!pnp_drv)
                 return 0;
 
-        if (pnp_dev->protocol && pnp_dev->protocol->resume)
+        if (pnp_dev->protocol->resume)
                 pnp_dev->protocol->resume(pnp_dev);
 
         if (pnp_can_write(pnp_dev)) {
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
index c283a9a70d83..63e64ef39fb7 100644
--- a/drivers/pnp/pnpacpi/core.c
+++ b/drivers/pnp/pnpacpi/core.c
@@ -44,7 +44,7 @@ static struct acpi_device_id excluded_id_list[] __initdata = {
         {"", 0},
 };
 
-static inline int is_exclusive_device(struct acpi_device *dev)
+static inline int __init is_exclusive_device(struct acpi_device *dev)
 {
         return (!acpi_match_device_ids(dev, excluded_id_list));
 }
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 2dcd1960aca8..98cbc9f18eed 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -84,10 +84,12 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
         while (!(res->irq_resource[i].flags & IORESOURCE_UNSET) &&
                i < PNP_MAX_IRQ)
                 i++;
-        if (i >= PNP_MAX_IRQ && !warned) {
-                printk(KERN_WARNING "pnpacpi: exceeded the max number of IRQ "
-                                "resources: %d \n", PNP_MAX_IRQ);
-                warned = 1;
+        if (i >= PNP_MAX_IRQ) {
+                if (!warned) {
+                        printk(KERN_WARNING "pnpacpi: exceeded the max number"
+                                " of IRQ resources: %d\n", PNP_MAX_IRQ);
+                        warned = 1;
+                }
                 return;
         }
         /*
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 37993206ae5d..e4daf4635c48 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -49,8 +49,11 @@ static void quirk_awe32_resources(struct pnp_dev *dev)
                 port2->max += 0x400;
                 port3->min += 0x800;
                 port3->max += 0x800;
+                dev_info(&dev->dev,
+                        "AWE32 quirk - added ioports 0x%lx and 0x%lx\n",
+                        (unsigned long)port2->min,
+                        (unsigned long)port3->min);
         }
-        printk(KERN_INFO "pnp: AWE32 quirk - adding two ports\n");
 }
 
 static void quirk_cmi8330_resources(struct pnp_dev *dev)
@@ -73,7 +76,8 @@ static void quirk_cmi8330_resources(struct pnp_dev *dev)
                             IORESOURCE_DMA_8BIT)
                                 dma->map = 0x000A;
         }
-        printk(KERN_INFO "pnp: CMI8330 quirk - fixing interrupts and dma\n");
+        dev_info(&dev->dev, "CMI8330 quirk - forced possible IRQs to 5, 7, 10 "
+                "and DMA channels to 1, 3\n");
 }
 
 static void quirk_sb16audio_resources(struct pnp_dev *dev)
@@ -104,8 +108,7 @@ static void quirk_sb16audio_resources(struct pnp_dev *dev)
                 changed = 1;
         }
         if (changed)
-                printk(KERN_INFO
-                       "pnp: SB audio device quirk - increasing port range\n");
+                dev_info(&dev->dev, "SB audio device quirk - increased port range\n");
 }
 
 
@@ -214,8 +217,8 @@ void pnp_fixup_device(struct pnp_dev *dev)
                         quirk = pnp_fixups[i].quirk_function;
 
 #ifdef DEBUG
-                        dev_dbg(&dev->dev, "calling quirk 0x%p", quirk);
-                        print_fn_descriptor_symbol(": %s()\n",
+                        dev_dbg(&dev->dev, "calling ");
+                        print_fn_descriptor_symbol("%s()\n",
                                 (unsigned long) *quirk);
 #endif
                         (*quirk)(dev);