diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 19:11:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 19:11:43 -0400 |
commit | 2e532d68a2b3e2aa6b19731501222069735c741c (patch) | |
tree | a2f37d0bc798fa186270b44a7064519a55530931 /drivers | |
parent | 52ad096465d60ee7fdc99583f969a99a1166c7c3 (diff) |
{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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/pci/quirks.c | 3 | ||||
-rw-r--r-- | drivers/pnp/quirks.c | 3 |
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 | |||
1561 | if ((f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) && | 1561 | if ((f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) && |
1562 | (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) { | 1562 | (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) { |
1563 | #ifdef DEBUG | 1563 | #ifdef DEBUG |
1564 | dev_dbg(&dev->dev, "calling "); | 1564 | dev_dbg(&dev->dev, "calling %pF\n", f->hook); |
1565 | print_fn_descriptor_symbol("%s\n", f->hook); | ||
1566 | #endif | 1565 | #endif |
1567 | f->hook(dev); | 1566 | f->hook(dev); |
1568 | } | 1567 | } |
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) | |||
338 | if (!compare_pnp_id(dev->id, f->id)) | 338 | if (!compare_pnp_id(dev->id, f->id)) |
339 | continue; | 339 | continue; |
340 | #ifdef DEBUG | 340 | #ifdef DEBUG |
341 | dev_dbg(&dev->dev, "%s: calling ", f->id); | 341 | dev_dbg(&dev->dev, "%s: calling %pF\n", f->id, f->quirk_function); |
342 | print_fn_descriptor_symbol("%s\n", f->quirk_function); | ||
343 | #endif | 342 | #endif |
344 | f->quirk_function(dev); | 343 | f->quirk_function(dev); |
345 | } | 344 | } |