pid: tighten pidmap spinlock critical section by removing kfree()

[safe/jmp/linux-2.6] / drivers / pnp / support.c

diff --git a/drivers/pnp/support.c b/drivers/pnp/support.c
index 1566e4a..9585c1c 100644 (file)
--- a/drivers/pnp/support.c
+++ b/drivers/pnp/support.c
@@ -2,6 +2,8 @@
  * support.c - standard functions for the use of pnp protocol drivers
  *
  * Copyright 2003 Adam Belay <ambx1@neo.rr.com>
+ * Copyright (C) 2008 Hewlett-Packard Development Company, L.P.
+ *     Bjorn Helgaas <bjorn.helgaas@hp.com>
  */
 
 #include <linux/module.h>
@@ -73,42 +75,102 @@ char *pnp_resource_type_name(struct resource *res)
 
 void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
 {
-#ifdef DEBUG
-       char buf[128];
-       int len = 0;
        struct pnp_resource *pnp_res;
-       struct resource *res;
 
-       dev_dbg(&dev->dev, "current resources: %s\n", desc);
-       list_for_each_entry(pnp_res, &dev->resources, list) {
-               res = &pnp_res->res;
+       if (list_empty(&dev->resources))
+               pnp_dbg(&dev->dev, "%s: no current resources\n", desc);
+       else {
+               pnp_dbg(&dev->dev, "%s: current resources:\n", desc);
+               list_for_each_entry(pnp_res, &dev->resources, list)
+                       pnp_dbg(&dev->dev, "%pr\n", &pnp_res->res);
+       }
+}
 
-               len += snprintf(buf + len, sizeof(buf) - len, "  %-3s ",
-                               pnp_resource_type_name(res));
+char *pnp_option_priority_name(struct pnp_option *option)
+{
+       switch (pnp_option_priority(option)) {
+       case PNP_RES_PRIORITY_PREFERRED:
+               return "preferred";
+       case PNP_RES_PRIORITY_ACCEPTABLE:
+               return "acceptable";
+       case PNP_RES_PRIORITY_FUNCTIONAL:
+               return "functional";
+       }
+       return "invalid";
+}
 
-               if (res->flags & IORESOURCE_DISABLED) {
-                       dev_dbg(&dev->dev, "%sdisabled\n", buf);
-                       continue;
-               }
+void dbg_pnp_show_option(struct pnp_dev *dev, struct pnp_option *option)
+{
+       char buf[128];
+       int len = 0, i;
+       struct pnp_port *port;
+       struct pnp_mem *mem;
+       struct pnp_irq *irq;
+       struct pnp_dma *dma;
+
+       if (pnp_option_is_dependent(option))
+               len += scnprintf(buf + len, sizeof(buf) - len,
+                                "  dependent set %d (%s) ",
+                                pnp_option_set(option),
+                                pnp_option_priority_name(option));
+       else
+               len += scnprintf(buf + len, sizeof(buf) - len,
+                                "  independent ");
 
-               switch (pnp_resource_type(res)) {
-               case IORESOURCE_IO:
-               case IORESOURCE_MEM:
-                       len += snprintf(buf + len, sizeof(buf) - len,
-                                       "%#llx-%#llx flags %#lx",
-                                       (unsigned long long) res->start,
-                                       (unsigned long long) res->end,
-                                       res->flags);
-                       break;
-               case IORESOURCE_IRQ:
-               case IORESOURCE_DMA:
-                       len += snprintf(buf + len, sizeof(buf) - len,
-                                       "%lld flags %#lx",
-                                       (unsigned long long) res->start,
-                                       res->flags);
-                       break;
+       switch (option->type) {
+       case IORESOURCE_IO:
+               port = &option->u.port;
+               len += scnprintf(buf + len, sizeof(buf) - len, "io  min %#llx "
+                                "max %#llx align %lld size %lld flags %#x",
+                                (unsigned long long) port->min,
+                                (unsigned long long) port->max,
+                                (unsigned long long) port->align,
+                                (unsigned long long) port->size, port->flags);
+               break;
+       case IORESOURCE_MEM:
+               mem = &option->u.mem;
+               len += scnprintf(buf + len, sizeof(buf) - len, "mem min %#llx "
+                                "max %#llx align %lld size %lld flags %#x",
+                                (unsigned long long) mem->min,
+                                (unsigned long long) mem->max,
+                                (unsigned long long) mem->align,
+                                (unsigned long long) mem->size, mem->flags);
+               break;
+       case IORESOURCE_IRQ:
+               irq = &option->u.irq;
+               len += scnprintf(buf + len, sizeof(buf) - len, "irq");
+               if (bitmap_empty(irq->map.bits, PNP_IRQ_NR))
+                       len += scnprintf(buf + len, sizeof(buf) - len,
+                                        " <none>");
+               else {
+                       for (i = 0; i < PNP_IRQ_NR; i++)
+                               if (test_bit(i, irq->map.bits))
+                                       len += scnprintf(buf + len,
+                                                        sizeof(buf) - len,
+                                                        " %d", i);
+               }
+               len += scnprintf(buf + len, sizeof(buf) - len, " flags %#x",
+                                irq->flags);
+               if (irq->flags & IORESOURCE_IRQ_OPTIONAL)
+                       len += scnprintf(buf + len, sizeof(buf) - len,
+                                        " (optional)");
+               break;
+       case IORESOURCE_DMA:
+               dma = &option->u.dma;
+               len += scnprintf(buf + len, sizeof(buf) - len, "dma");
+               if (!dma->map)
+                       len += scnprintf(buf + len, sizeof(buf) - len,
+                                        " <none>");
+               else {
+                       for (i = 0; i < 8; i++)
+                               if (dma->map & (1 << i))
+                                       len += scnprintf(buf + len,
+                                                        sizeof(buf) - len,
+                                                        " %d", i);
                }
-               dev_dbg(&dev->dev, "%s\n", buf);
+               len += scnprintf(buf + len, sizeof(buf) - len, " (bitmask %#x) "
+                                "flags %#x", dma->map, dma->flags);
+               break;
        }
-#endif
+       pnp_dbg(&dev->dev, "%s\n", buf);
 }