pnp: clean up pnp_fixup_device()

Make it look a bit more like pci_fixup_device/pci_do_fixups.  Also print
the PnP ID and delete the () from the "foo+0x0/0x1234()".

Signed-off-by: Rene Herman <rene.herman@gmail.com>
Tested-by: Uwe Bugla <uwe.bugla@gmx.de>
Acked-by: Uwe Bugla <uwe.bugla@gmx.de>
Acked-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Len Brown <len.brown@intel.com
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index d049a2279feac460d0dda5e4a21f2471c1b059b0..a1af2f989482b6de8367df830b62477ed10dd189 100644 (file)
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -212,20 +212,16 @@ static struct pnp_fixup pnp_fixups[] = {
 
 void pnp_fixup_device(struct pnp_dev *dev)
 {
-       int i = 0;
-       void (*quirk)(struct pnp_dev *);
-
-       while (*pnp_fixups[i].id) {
-               if (compare_pnp_id(dev->id, pnp_fixups[i].id)) {
-                       quirk = pnp_fixups[i].quirk_function;
+       struct pnp_fixup *f;
 
+       for (f = pnp_fixups; *f->id; f++) {
+               if (!compare_pnp_id(dev->id, f->id))
+                       continue;
 #ifdef DEBUG
-                       dev_dbg(&dev->dev, "calling ");
-                       print_fn_descriptor_symbol("%s()\n",
-                               (unsigned long) *quirk);
+               dev_dbg(&dev->dev, "%s: calling ", f->id);
+               print_fn_descriptor_symbol("%s\n",
+                               (unsigned long) f->quirk_function);
 #endif
-                       (*quirk)(dev);
-               }
-               i++;
+               f->quirk_function(dev);
        }
 }