[PATCH 1/3] PNP: cleanup pnp_fixup_device()

Rene Herman
2008-05-06T01:07:37Z

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

Hi Bjorn.

In response to off-list AD181x thread, small cleanup to quirk handling.

Patch 3/3 does the actual work. Mind if I feed this stuff through you? And,
mind this, period? Not wed to it or anything...

Signed-off-by: Rene Herman <rene.herman@gmail.com>

[-- Attachment #2: pnp-cleanup-pnp_fixup_device.diff --]
[-- Type: text/plain, Size: 1067 bytes --]

commit 4ed0cb4cef2b45a257b6d7d6cdc987e3511ddf58
Author: Rene Herman <rene.herman@gmail.com>
Date: Tue May 6 01:51:47 2008 +0200

PNP: cleanup pnp_fixup_device()

Signed-off-by: Rene Herman <rene.herman@gmail.com>

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 3f2d34a..10b1295 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -209,20 +209,12 @@ 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;
-
-#ifdef DEBUG
- dev_dbg(&dev->dev, "calling quirk 0x%p", quirk);
- print_fn_descriptor_symbol(": %s()\n",
- (unsigned long) *quirk);
-#endif
- (*quirk)(dev);
- }
- i++;
+ int i;
+
+ for (i = 0; *pnp_fixups[i].id; i++) {
+ if (!compare_pnp_id(dev->id, pnp_fixups[i].id))
+ continue;
+ dev_dbg(&dev->dev, "calling quirk for %s\n", pnp_fixups[i].id);
+ pnp_fixups[i].quirk_function(dev);
}
}