[SCSI] 3w-9xxx: remove unnecessary local_irq_save/restore for scsi sg copy API

[linux-2.6-omap-h63xx.git] / drivers / pnp / quirks.c

diff --git a/drivers/pnp/quirks.c b/drivers/pnp/quirks.c
index 0bdf9b8a5e58593d308ecc95f25fb7d2209e2998..c144bd575611f300249923264f065741957e9bb3 100644 (file)
--- a/drivers/pnp/quirks.c
+++ b/drivers/pnp/quirks.c
@@ -245,7 +245,7 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
         */
        for_each_pci_dev(pdev) {
                for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
-                       unsigned int type;
+                       unsigned long type;
 
                        type = pci_resource_flags(pdev, i) &
                                        (IORESOURCE_IO | IORESOURCE_MEM);
@@ -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);
        }