summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 16:11:43 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-16 16:11:43 -0700
commit2e532d68a2b3e2aa6b19731501222069735c741c (patch)
treea2f37d0bc798fa186270b44a7064519a55530931
parent52ad096465d60ee7fdc99583f969a99a1166c7c3 (diff)
downloadlinux-stable-2e532d68a2b3e2aa6b19731501222069735c741c.tar.gz
linux-stable-2e532d68a2b3e2aa6b19731501222069735c741c.tar.bz2
linux-stable-2e532d68a2b3e2aa6b19731501222069735c741c.zip
{pci,pnp} quirks.c: don't use deprecated print_fn_descriptor_symbol()
I dunno how this missed Bjorn and his quest to use %pF in commit c80cfb0406c01bb5da91bfe30f5cb1fd96831138 ("vsprintf: use new vsprintf symbolic function pointer format"), but it did. So use %pF in the two remaining places that still tried to print out function pointers by hand. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/pci/quirks.c3
-rw-r--r--drivers/pnp/quirks.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 9236e7f869c8..e872ac925b4b 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1561,8 +1561,7 @@ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_f
if ((f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) &&
(f->device == dev->device || f->device == (u16) PCI_ANY_ID)) {
#ifdef DEBUG
- dev_dbg(&dev->dev, "calling ");
- print_fn_descriptor_symbol("%s\n", f->hook);
+ dev_dbg(&dev->dev, "calling %pF\n", f->hook);
#endif
f->hook(dev);
}
diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index d15e2b77af88..c144bd575611 100644
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -338,8 +338,7 @@ void pnp_fixup_device(struct pnp_dev *dev)
if (!compare_pnp_id(dev->id, f->id))
continue;
#ifdef DEBUG
- dev_dbg(&dev->dev, "%s: calling ", f->id);
- print_fn_descriptor_symbol("%s\n", f->quirk_function);
+ dev_dbg(&dev->dev, "%s: calling %pF\n", f->id, f->quirk_function);
#endif
f->quirk_function(dev);
}