ehea: fix might sleep problem

[linux-2.6] / drivers / pnp / pnpbios / rsparser.c

diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index c1f9e162d2c599ff7aff1e57b243f259b7910cbd..5ff9a4c0447ec8052e0de9a433255051826e1298 100644 (file)
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -4,7 +4,6 @@
 
 #include <linux/ctype.h>
 #include <linux/pnp.h>
-#include <linux/pnpbios.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 
@@ -54,83 +53,28 @@ inline void pcibios_penalize_isa_irq(int irq, int active)
  * Allocated Resources
  */
 
-static void pnpbios_parse_allocated_irqresource(struct pnp_dev *dev, int irq)
+static void pnpbios_parse_allocated_ioresource(struct pnp_dev *dev,
+                                              int start, int len)
 {
-       struct pnp_resource_table *res = &dev->res;
-       int i = 0;
-
-       while (!(res->irq_resource[i].flags & IORESOURCE_UNSET)
-              && i < PNP_MAX_IRQ)
-               i++;
-       if (i < PNP_MAX_IRQ) {
-               res->irq_resource[i].flags = IORESOURCE_IRQ;    // Also clears _UNSET flag
-               if (irq == -1) {
-                       res->irq_resource[i].flags |= IORESOURCE_DISABLED;
-                       return;
-               }
-               res->irq_resource[i].start =
-                   res->irq_resource[i].end = (unsigned long)irq;
-               pcibios_penalize_isa_irq(irq, 1);
-       }
-}
+       int flags = 0;
+       int end = start + len - 1;
 
-static void pnpbios_parse_allocated_dmaresource(struct pnp_dev *dev, int dma)
-{
-       struct pnp_resource_table *res = &dev->res;
-       int i = 0;
-
-       while (i < PNP_MAX_DMA &&
-              !(res->dma_resource[i].flags & IORESOURCE_UNSET))
-               i++;
-       if (i < PNP_MAX_DMA) {
-               res->dma_resource[i].flags = IORESOURCE_DMA;    // Also clears _UNSET flag
-               if (dma == -1) {
-                       res->dma_resource[i].flags |= IORESOURCE_DISABLED;
-                       return;
-               }
-               res->dma_resource[i].start =
-                   res->dma_resource[i].end = (unsigned long)dma;
-       }
-}
+       if (len <= 0 || end >= 0x10003)
+               flags |= IORESOURCE_DISABLED;
 
-static void pnpbios_parse_allocated_ioresource(struct pnp_dev *dev,
-                                              int io, int len)
-{
-       struct pnp_resource_table *res = &dev->res;
-       int i = 0;
-
-       while (!(res->port_resource[i].flags & IORESOURCE_UNSET)
-              && i < PNP_MAX_PORT)
-               i++;
-       if (i < PNP_MAX_PORT) {
-               res->port_resource[i].flags = IORESOURCE_IO;    // Also clears _UNSET flag
-               if (len <= 0 || (io + len - 1) >= 0x10003) {
-                       res->port_resource[i].flags |= IORESOURCE_DISABLED;
-                       return;
-               }
-               res->port_resource[i].start = (unsigned long)io;
-               res->port_resource[i].end = (unsigned long)(io + len - 1);
-       }
+       pnp_add_io_resource(dev, start, end, flags);
 }
 
 static void pnpbios_parse_allocated_memresource(struct pnp_dev *dev,
-                                               int mem, int len)
+                                               int start, int len)
 {
-       struct pnp_resource_table *res = &dev->res;
-       int i = 0;
-
-       while (!(res->mem_resource[i].flags & IORESOURCE_UNSET)
-              && i < PNP_MAX_MEM)
-               i++;
-       if (i < PNP_MAX_MEM) {
-               res->mem_resource[i].flags = IORESOURCE_MEM;    // Also clears _UNSET flag
-               if (len <= 0) {
-                       res->mem_resource[i].flags |= IORESOURCE_DISABLED;
-                       return;
-               }
-               res->mem_resource[i].start = (unsigned long)mem;
-               res->mem_resource[i].end = (unsigned long)(mem + len - 1);
-       }
+       int flags = 0;
+       int end = start + len - 1;
+
+       if (len <= 0)
+               flags |= IORESOURCE_DISABLED;
+
+       pnp_add_mem_resource(dev, start, end, flags);
 }
 
 static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev,
@@ -138,7 +82,7 @@ static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev,
                                                            unsigned char *end)
 {
        unsigned int len, tag;
-       int io, size, mask, i;
+       int io, size, mask, i, flags;
 
        if (!p)
                return NULL;
@@ -195,23 +139,31 @@ static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev,
                case SMALL_TAG_IRQ:
                        if (len < 2 || len > 3)
                                goto len_err;
+                       flags = 0;
                        io = -1;
                        mask = p[1] + p[2] * 256;
                        for (i = 0; i < 16; i++, mask = mask >> 1)
                                if (mask & 0x01)
                                        io = i;
-                       pnpbios_parse_allocated_irqresource(dev, io);
+                       if (io != -1)
+                               pcibios_penalize_isa_irq(io, 1);
+                       else
+                               flags = IORESOURCE_DISABLED;
+                       pnp_add_irq_resource(dev, io, flags);
                        break;
 
                case SMALL_TAG_DMA:
                        if (len != 2)
                                goto len_err;
+                       flags = 0;
                        io = -1;
                        mask = p[1];
                        for (i = 0; i < 8; i++, mask = mask >> 1)
                                if (mask & 0x01)
                                        io = i;
-                       pnpbios_parse_allocated_dmaresource(dev, io);
+                       if (io == -1)
+                               flags = IORESOURCE_DISABLED;
+                       pnp_add_dma_resource(dev, io, flags);
                        break;
 
                case SMALL_TAG_PORT:
@@ -639,7 +591,8 @@ static void pnpbios_encode_irq(struct pnp_dev *dev, unsigned char *p,
        p[1] = map & 0xff;
        p[2] = (map >> 8) & 0xff;
 
-       dev_dbg(&dev->dev, "  encode irq %d\n", res->start);
+       dev_dbg(&dev->dev, "  encode irq %llu\n",
+               (unsigned long long)res->start);
 }
 
 static void pnpbios_encode_dma(struct pnp_dev *dev, unsigned char *p,
@@ -650,7 +603,8 @@ static void pnpbios_encode_dma(struct pnp_dev *dev, unsigned char *p,
        map = 1 << res->start;
        p[1] = map & 0xff;
 
-       dev_dbg(&dev->dev, "  encode dma %d\n", res->start);
+       dev_dbg(&dev->dev, "  encode dma %llu\n",
+               (unsigned long long)res->start);
 }
 
 static void pnpbios_encode_port(struct pnp_dev *dev, unsigned char *p,